Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2017-11-05 11:21:49 +01:00
8 changed files with 67 additions and 8 deletions

View File

@@ -3,6 +3,7 @@
<div id="viewpoll" class="panel bg1 portal-no-margin">
<div class="inner">
<!-- BEGIN poll -->
<!-- IF not poll.S_FIRST_ROW --><hr class="dashed" /><!-- ENDIF -->
<!-- IF poll.S_CAN_VOTE --><form method="post" action="{poll.S_POLL_ACTION}"><!-- ENDIF -->
<div class="content">
<h2>{poll.POLL_QUESTION}</h2>

View File

@@ -2,6 +2,7 @@
<!-- IF S_HAS_POLL -->
<div id="viewpoll" class="inner">
<!-- BEGIN poll_side -->
<!-- IF not poll_side.S_FIRST_ROW --><hr class="dashed" /><!-- ENDIF -->
<!-- IF poll_side.S_CAN_VOTE --><form method="post" action="{poll_side.S_POLL_ACTION}"><!-- ENDIF -->
<div class="content">
<h2>{poll_side.POLL_QUESTION}</h2>