Merge branch 'feature/lien-edition-vote' into 'develop'

Donner le lien d'édition d'un vote lorsqu'on est administrateur

See merge request framasoft/framadate!267
This commit is contained in:
Thomas Citharel 2018-04-03 20:20:01 +02:00
commit a367a4abac
3 changed files with 12 additions and 1 deletions

View File

@ -283,7 +283,8 @@
"Vote yes for": "Vote \"yes\" for", "Vote yes for": "Vote \"yes\" for",
"Votes of the poll": "Votes", "Votes of the poll": "Votes",
"polled user": "polled user", "polled user": "polled user",
"polled users": "polled users" "polled users": "polled users",
"Link to edit this particular line" : "Link to edit this particular line"
}, },
"PollInfo": { "PollInfo": {
"Admin link of the poll": "Admin link for the poll", "Admin link of the poll": "Admin link for the poll",

View File

@ -151,6 +151,11 @@
title="{__('Poll results', 'Remove the line:')} {$vote->name|html}"> title="{__('Poll results', 'Remove the line:')} {$vote->name|html}">
<i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span> <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
</a> </a>
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm">
{__('Poll results', 'Link to edit this particular line')} <span class="btn-link glyphicon glyphicon-link"></span>
</a>
{/if} {/if}
</td> </td>
{else} {else}

View File

@ -209,6 +209,11 @@
title="{__('Poll results', 'Remove the line:')} {$vote->name|html}"> title="{__('Poll results', 'Remove the line:')} {$vote->name|html}">
<i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span> <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
</a> </a>
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm">
{__('Poll results', 'Link to edit this particular line')} <span class="btn-link glyphicon glyphicon-link"></span>
</a>
{/if} {/if}
</td> </td>
{else} {else}