Merge branch '3.1.x'

* 3.1.x:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
This commit is contained in:
Cesar G 2015-05-28 11:17:20 +02:00
commit 30d39687de

View file

@ -6,13 +6,14 @@
<!-- ENDIF --> <!-- ENDIF -->
<fieldset class="fields2"> <fieldset class="fields2">
<!-- IF S_SHOW_POLL_BOX -->
<!-- IF S_POLL_DELETE --> <!-- IF S_POLL_DELETE -->
<dl> <dl>
<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt> <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd> <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_SHOW_POLL_BOX -->
<dl> <dl>
<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt> <dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>
<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd> <dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>
@ -44,14 +45,8 @@
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT posting_poll_body_options_after -->
<!-- IF S_POLL_DELETE --> <!-- EVENT posting_poll_body_options_after -->
<dl class="fields1">
<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
</dl>
<!-- ENDIF -->
</fieldset> </fieldset>
</div> </div>