Commit a1746e72 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "URLs not showing on notifications in Inbox (Bug 1465913)"

parents 03abd36b b0e16ed9
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</h4> </h4>
<div id="notification-{$item->table}-{$item->id}" class="collapse"> <div id="notification-{$item->table}-{$item->id}" class="collapse">
{if $item->message} {if $item->message}
<div class="content panel-body {if $item->url && $item->urltext !== 'Reply'}mbl no-footer{/if}"> <div class="content panel-body {if !($item->canreply || $item->canreplyall)}mbl no-footer{/if}">
{if ($item->fromusr != 0)} {if ($item->fromusr != 0)}
<p class="fromusers"> <p class="fromusers">
<strong> <strong>
...@@ -123,10 +123,12 @@ ...@@ -123,10 +123,12 @@
{/if} {/if}
</p> </p>
<p>{$item->message|safe}</p> <p>{$item->message|safe}</p>
{if $item->url && $item->urltext === 'Collection'} {if $item->url}
<a class="action" href="{$WWWROOT}{$item->url}"> <a class="action" href="{$WWWROOT}{$item->url}">
<span class="icon icon-arrow-right"></span> <span class="icon icon-arrow-right"></span>
{if $item->urltext}
{$item->urltext} {$item->urltext}
</a> </a>
{/if} {/if}
</div> </div>
Supports Markdown
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