Commit 2e74c664 authored by Robert Lyon's avatar Robert Lyon
Browse files

Expanding links in inbox/notes now more accessible (Bug #1324347)



Added helpful text to explain what is happening
Changed the 'link to' text in inbox to be easier to understand
than a >> or 'more ...'

Change-Id: I3b3b01232c01cba66cf8b39f3985affd524fd8da
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 78a69418
......@@ -15,12 +15,9 @@
<tr class="{cycle values='r0,r1'}">
<td class="notetitle">
{if $n->locked}
<h3 class="title"><a class="notetitle" href="" id="n{$n->id}">{$n->title|str_shorten_text:80:true}</a></h3>
<h3 class="title"><a class="notetitle" href="" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden">{str tag=clickformore}</span></a></h3>
{else}
<h3 class="title"><a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true}</a></h3>
{/if}
{if $n->tags}
<div class="tags">{str tag=tags}: {list_tags tags=$n->tags owner=$n->owner}</div>
<h3 class="title"><a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden">{str tag=clickformore}</span></a></h3>
{/if}
<div id="n{$n->id}_desc" class="hidden detail">{$n->description|clean_html|safe}
{if $n->files}
......@@ -50,8 +47,11 @@
</tbody>
</table>
</div>
{/if}
</div>
{/if}
</div>
{if $n->tags}
<div class="tags">{str tag=tags}: {list_tags tags=$n->tags owner=$n->owner}</div>
{/if}
</td>
<td>
{foreach from=$n->blocks item=b}
......
......@@ -37,6 +37,8 @@ $string['unread'] = 'Unread';
$string['markasread'] = 'Mark as read';
$string['selectall'] = 'Select all';
$string['selectallread'] = 'All unread notifications';
$string['selectalldelete'] = 'All notifications for deletion';
$string['recurseall'] = 'Recurse all';
$string['alltypes'] = 'All types';
......
......@@ -51,6 +51,9 @@ $string['toggletoolbarson'] = 'Toggle toolbars on. Show full list of buttons';
$string['toggletoolbarsoff'] = 'Toggle toolbars off. Show basic buttons';
$string['defaulthint'] = 'Type in a search term';
$string['imagexofy'] = 'Image {x} of {y}';
$string['clickformore'] = '(Press \'enter\' to display more information)';
$string['goto'] = 'Go to \'%s\'';
$string['gotomore'] = 'Read more...';
// Objectionable strings.
$string['complaint'] = 'Complaint';
$string['notifyadministrator'] = 'Notify administrator';
......
......@@ -9,9 +9,11 @@
</td>
<td>
{if $item->message}
<a href="" onclick="showHideMessage({$item->id}); return false;" class="inbox-showmessage{if !$item->read} unread{/if}">{if !$item->read}<span class="accessible-hidden">{str tag=unread section=activity}: </span>{/if}{$item->subject}</a>
<a href="" onclick="showHideMessage({$item->id}); return false;" class="inbox-showmessage{if !$item->read} unread{/if}">{if !$item->read}<span class="accessible-hidden">{str tag=unread section=activity}: </span>{/if}{$item->subject} <span class="accessible-hidden">{str tag=clickformore}</span></a>
<div id="message-{$item->id}" class="hidden inbox-message">{$item->message|safe}
{if $item->url}<br><a href="{$WWWROOT}{$item->url}">{if $item->urltext}{$item->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
{if $item->url}<br>
<a href="{$WWWROOT}{$item->url}">{if $item->urltext}{str tag=goto arg1=$item->urltext}{else}{str tag=gotomore}{/if}</a>
{/if}
</div>
{elseif $item->url}
<a href="{$WWWROOT}{$item->url}">{$item->subject}</a>
......
{include file="header.tpl"}
<div id="notifications">
<form method="post">
<label for="notifications_type">{str section='activity' tag='type'}:</label>
<select id="notifications_type" name="type">
<option value="all">--</option>
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>{$name}</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</form>
<div id="notifications">
<form method="post">
<label for="notifications_type">{str section='activity' tag='type'}:</label>
<select id="notifications_type" name="type">
<option value="all">--</option>
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>{$name}</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</form>
{$deleteall|safe}
<form name="notificationlist" method="post" onSubmit="markread(this, 'read'); return false;">
<table id="activitylist" class="fullwidth">
<thead>
<tr>
<th><span class="accessible-hidden">{str section='activity' tag='messagetype'}</span></th>
<th>{str section='activity' tag='subject'}</th>
<th>{str section='activity' tag='date'}</th>
<th class="center">{str section='activity' tag='read'}</th>
<th class="center">{str tag='delete'}</th>
</tr>
</thead>
{$deleteall|safe}
<form name="notificationlist" method="post" onSubmit="markread(this, 'read'); return false;">
<table id="activitylist" class="fullwidth">
<thead>
<tr>
<th><span class="accessible-hidden">{str section='activity' tag='messagetype'}</span></th>
<th>{str section='activity' tag='subject'}</th>
<th>{str section='activity' tag='date'}</th>
<th class="center">{str section='activity' tag='read'}</th>
<th class="center">{str tag='delete'}</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="3"></td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckread'); return false;">{str section='activity' tag='selectall'}</a>
</td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckdel'); return false;">{str section='activity' tag='selectall'}</a>
</td>
</tr>
</tfoot>
<tbody>
<tr>
<td colspan="3"></td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckread'); return false;">{str section='activity' tag='selectall'}<span class="accessible-hidden"> {str section='activity' tag='selectallread'}</span></a>
</td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckdel'); return false;">{str section='activity' tag='selectall'} <span class="accessible-hidden">{str section='activity' tag='selectalldelete'}</span></a>
</td>
</tr>
</tfoot>
<tbody>
{$activitylist.tablerows|safe}
</tbody>
</table>
<div class="right activity-buttons">
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-del" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" />
</div>
{$activitylist.pagination|safe}
</form>
</div>
</tbody>
</table>
<div class="right activity-buttons">
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-del" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" />
</div>
{$activitylist.pagination|safe}
</form>
</div>
{include file="footer.tpl"}
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