Commit 260b9431 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1852522: don't show 'Display page' for site templates"

parents fd746e48 527fefd9
......@@ -13,10 +13,12 @@
</a>
{/if}
{if $selected == 'content'}
<a id='displaypagebtn' class="btn btn-secondary editviews displaycontent active" href="{$WWWROOT}view/view.php?id={$viewid}" title="{str tag=displayview section=view}">
<span class="icon icon-lg icon-tv" aria-hidden="true" role="presentation"></span>
<span class="btn-title sr-only">{str tag=displayview section=view}</span>
</a>
{if $viewurl}
<a id='displaypagebtn' class="btn btn-secondary editviews displaycontent active" href="{$WWWROOT}view/view.php?id={$viewid}" title="{str tag=displayview section=view}">
<span class="icon icon-lg icon-tv" aria-hidden="true" role="presentation"></span>
<span class="btn-title sr-only">{str tag=displayview section=view}</span>
</a>
{/if}
{else}
<a class="btn btn-secondary editviews editcontent {if $selected == 'content'}active{/if}" href="{$WWWROOT}view/blocks.php?id={$viewid}" title="{str tag=editcontent1 section=view}">
<span class="icon icon-lg icon-pencil-alt" aria-hidden="true" role="presentation"></span>
......
......@@ -368,6 +368,7 @@ $smarty->assign('instructions', $view->get('instructions'));
$smarty->assign('instructionscollapsed', $view->get('instructionscollapsed'));
$returnto = $view->get_return_to_url_and_title();
$smarty->assign('url', $returnto['url']);
$smarty->assign('viewurl', $view->get_url());
$smarty->assign('title', $returnto['title']);
$smarty->assign('accessible', $view->get('accessibleview'));
$smarty->display('view/blocks.tpl');
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