diff --git a/locale/de.json b/locale/de.json
index a8191e24e12c8cdc3a3a005b6a96c60be74effe2..16110a098c51c2b81f1cc3f151bad049514ec1d7 100644
--- a/locale/de.json
+++ b/locale/de.json
@@ -37,6 +37,7 @@
"Link": "Link",
"Search": "Suche",
"Creation date:": "Erstellungsdatum:",
+ "Caption": "Bildunterschrift",
"ASTERISK": "*"
},
"Date": {
diff --git a/locale/en.json b/locale/en.json
index 9f9d69987f3b63380c80f092a87dc29001a9d522..7cf3d2c49b8891d9eb8261b0fade5a3b12aacef3 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -37,6 +37,7 @@
"Link": "Link",
"Search": "Search",
"Creation date:": "Creation date:",
+ "Caption": "Caption",
"ASTERISK": "*"
},
"Date" : {
diff --git a/locale/es.json b/locale/es.json
index cf8e31ff06f821f42c21887b0493b2e7f7a90d68..37391f5b5b877dd23d8dd5195d4d3a661acfb6b0 100644
--- a/locale/es.json
+++ b/locale/es.json
@@ -37,6 +37,7 @@
"Link": "ES_Lien",
"Search": "Búsqueda",
"Creation date:": "ES_Date de création :",
+ "Caption": "Leyenda",
"ASTERISK": "*"
},
"Date": {
diff --git a/locale/fr.json b/locale/fr.json
index 01e0250da0b963715314745ccb9cef32da446a05..af509902969a3af0f1980ba6841f65ea496d1690 100644
--- a/locale/fr.json
+++ b/locale/fr.json
@@ -37,6 +37,7 @@
"Link": "Lien",
"Search": "Chercher",
"Creation date:": "Date de création :",
+ "Caption": "Légende",
"ASTERISK": "*"
},
"Date": {
diff --git a/locale/it.json b/locale/it.json
index 3dd15f36903921d9e92ab2790d6f4d6b3a79b3fd..0ca500879f67c4c73d680f8d77ee6e436d7e63be 100644
--- a/locale/it.json
+++ b/locale/it.json
@@ -37,6 +37,7 @@
"Link": "Link",
"Search": "IT_Chercher",
"Creation date:": "IT_Date de création :",
+ "Caption": "Titolo",
"ASTERISK": "*"
},
"Date": {
diff --git a/tpl/part/poll_hint.tpl b/tpl/part/poll_hint.tpl
index e4c0fc53254510e17832ceff1d547bc29d7713c6..29f5c2da9679749bb12a4f027457b16055f12ea9 100644
--- a/tpl/part/poll_hint.tpl
+++ b/tpl/part/poll_hint.tpl
@@ -1,11 +1,35 @@
-{if $active}
- <div class="alert alert-info">
- <p>{__('studs', 'If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.')}</p>
- <p aria-hidden="true"><b>{__('Generic', 'Legend:')}</b> <span class="glyphicon glyphicon-ok"></span> = {__('Generic', 'Yes')}, <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = {__('Generic', 'Ifneedbe')}, <span class="glyphicon glyphicon-ban-circle"></span> = {__('Generic', 'No')}</p>
+<div id="hint_modal" class="modal fade">
+ <div class="modal-dialog modal-lg">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4 class="modal-title">{__('Generic', 'Caption')}</h4>
+ </div>
+ <div class="modal-body">
+ {if $active}
+ <div class="alert alert-info">
+ <p>{__('studs', 'If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.')}</p>
+
+ <p aria-hidden="true"><b>{__('Generic', 'Legend:')}</b> <span
+ class="glyphicon glyphicon-ok"></span>
+ = {__('Generic', 'Yes')}, <b>(<span class="glyphicon glyphicon-ok"></span>)</b>
+ = {__('Generic', 'Ifneedbe')}, <span class="glyphicon glyphicon-ban-circle"></span>
+ = {__('Generic', 'No')}</p>
+ </div>
+ {else}
+ <div class="alert alert-danger">
+ <p>{__('studs', 'POLL_LOCKED_WARNING')}</p>
+
+ <p aria-hidden="true"><b>{__('Generic', 'Legend:')}</b> <span
+ class="glyphicon glyphicon-ok"></span>
+ = {__('Generic', 'Yes')}, <b>(<span class="glyphicon glyphicon-ok"></span>)</b>
+ = {__('Generic', 'Ifneedbe')}, <span class="glyphicon glyphicon-ban-circle"></span>
+ = {__('Generic', 'No')}</p>
+ </div>
+ {/if}
+ </div>
+ </div>
</div>
-{else}
- <div class="alert alert-danger">
- <p>{__('studs', 'POLL_LOCKED_WARNING')}</p>
- <p aria-hidden="true"><b>{__('Generic', 'Legend:')}</b> <span class="glyphicon glyphicon-ok"></span> = {__('Generic', 'Yes')}, <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = {__('Generic', 'Ifneedbe')}, <span class="glyphicon glyphicon-ban-circle"></span> = {__('Generic', 'No')}</p>
- </div>
-{/if}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/tpl/part/poll_hint_admin.tpl b/tpl/part/poll_hint_admin.tpl
index 8a16d08698242dcb4ab00a960f1c12cc350f1b78..a750c0cd760e6e58e3d8222e50a18382e69c17b9 100644
--- a/tpl/part/poll_hint_admin.tpl
+++ b/tpl/part/poll_hint_admin.tpl
@@ -1,7 +1,34 @@
-<div class="alert alert-info">
- <p>{__('adminstuds', 'As poll administrator, you can change all the lines of this poll with this button')} <span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span>,
- {__('adminstuds', 'remove a column or a line with')} <span class="glyphicon glyphicon-remove text-danger"></span><span class="sr-only">{__('Generic', 'Remove')}</span>
- {__('adminstuds', 'and add a new column with')} <span class="glyphicon glyphicon-plus text-success"></span><span class="sr-only">{__('adminstuds', 'Add a column')}</span>.</p>
- <p>{__('adminstuds', 'Finally, you can change the informations of this poll like the title, the comments or your email address.')}</p>
- <p aria-hidden="true"><strong>{__('Generic', 'Legend:')}</strong> <span class="glyphicon glyphicon-ok"></span> = {__('Generic', 'Yes')}, <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = {__('Generic', 'Ifneedbe')}, <span class="glyphicon glyphicon-ban-circle"></span> = {__('Generic', 'No')}</p>
-</div>
\ No newline at end of file
+<div id="hint_modal" class="modal fade">
+ <div class="modal-dialog modal-lg">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4 class="modal-title">{__('Generic', 'Caption')}</h4>
+ </div>
+ <div class="modal-body">
+ <div class="alert alert-info">
+ <p>{__('adminstuds', 'As poll administrator, you can change all the lines of this poll with this button')}
+ <span class="glyphicon glyphicon-pencil"></span><span
+ class="sr-only">{__('Generic', 'Edit')}</span>,
+ {__('adminstuds', 'remove a column or a line with')} <span
+ class="glyphicon glyphicon-remove text-danger"></span><span
+ class="sr-only">{__('Generic', 'Remove')}</span>
+ {__('adminstuds', 'and add a new column with')} <span
+ class="glyphicon glyphicon-plus text-success"></span><span
+ class="sr-only">{__('adminstuds', 'Add a column')}</span>.</p>
+
+ <p>{__('adminstuds', 'Finally, you can change the informations of this poll like the title, the comments or your email address.')}</p>
+
+ <p aria-hidden="true"><strong>{__('Generic', 'Legend:')}</strong> <span
+ class="glyphicon glyphicon-ok"></span> = {__('Generic', 'Yes')}, <b>(<span
+ class="glyphicon glyphicon-ok"></span>)</b> = {__('Generic', 'Ifneedbe')}, <span
+ class="glyphicon glyphicon-ban-circle"></span> = {__('Generic', 'No')}</p>
+ </div>
+ </div>
+ </div>
+ <!-- /.modal-content -->
+ </div>
+ <!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 20fe88583775f429596737c74692fd285a2ca04a..bd092ef185b2f8b2c2b40ff65f725e49240bf338 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -2,7 +2,10 @@
{$best_choices = [0]}
{/if}
-<h3>{__('Poll results', 'Votes of the poll')}Â {if $hidden}<i>({__('PollInfo', 'Results are hidden.')})</i>{/if}</h3>
+<h3>
+ {__('Poll results', 'Votes of the poll')}Â {if $hidden}<i>({__('PollInfo', 'Results are hidden.')})</i>{/if}
+ <a href="" data-toggle="modal" data-target="#hint_modal"><i class="glyphicon glyphicon-info-sign"></i></a>
+</h3>
<div id="tableContainer" class="tableContainer">
<form action="{if $admin}{poll_url id=$admin_poll_id admin=true}{else}{poll_url id=$poll_id}{/if}" method="POST" id="poll_form">
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 029e11f5e13397a2c45f0e08e75d5585759317f6..a072a6347f09a249fa3acd72e107fae12e232782 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -2,7 +2,10 @@
{$best_choices = [0]}
{/if}
-<h3>{__('Poll results', 'Votes of the poll')}Â {if $hidden}<i>({__('PollInfo', 'Results are hidden.')})</i>{/if}</h3>
+<h3>
+ {__('Poll results', 'Votes of the poll')}Â {if $hidden}<i>({__('PollInfo', 'Results are hidden.')})</i>{/if}
+ <a href="" data-toggle="modal" data-target="#hint_modal"><i class="glyphicon glyphicon-info-sign"></i></a>
+</h3>
<div id="tableContainer" class="tableContainer">