From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 14 Apr 2021 08:23:01 +0000 (+0200)
Subject: Merge branch '5.3'
X-Git-Tag: 5.4.0_Alpha_1~93
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aafbd097d476f18cb154556c237d000e893a97ca;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.3'
---

aafbd097d476f18cb154556c237d000e893a97ca
diff --cc wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
index c6eb65e6e6,4835179d0c..31b83cd4a1
--- a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
@@@ -20,9 -39,9 +20,9 @@@
  	</div>
  {/hascontent}
  
- {hascontent}
+ {if $objects|count}
  	<div id="captchaQuestionTabelContainer" class="section tabularBox">
 -		<table class="table">
 +		<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\captcha\question\CaptchaQuestionAction">
  			<thead>
  				<tr>
  					<th class="columnID columnQuestionID active ASC" colspan="2">{lang}wcf.global.objectID{/lang}</th>
@@@ -32,24 -51,22 +32,22 @@@
  				</tr>
  			</thead>
  			
 -			<tbody>
 +			<tbody class="jsReloadPageWhenEmpty">
- 				{content}
- 					{foreach from=$objects item='question'}
- 						<tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
- 							<td class="columnIcon">
- 								{objectAction action="toggle" isDisabled=$question->isDisabled}
- 								<a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
- 								{objectAction action="delete" objectTitle=$question->getQuestion()}
- 								
- 								{event name='rowButtons'}
- 							</td>
- 							<td class="columnID columnQuestionID">{$question->questionID}</td>
- 							<td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{$question->getQuestion()}</a></td>
+ 				{foreach from=$objects item='question'}
 -					<tr class="jsQuestionRow">
++					<tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
+ 						<td class="columnIcon">
 -							<span class="icon icon16 fa-{if !$question->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $question->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$question->questionID}"></span>
++							{objectAction action="toggle" isDisabled=$question->isDisabled}
+ 							<a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 -							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$question->questionID}" data-confirm-message-html="{lang __encode=true}wcf.acp.captcha.question.delete.confirmMessage{/lang}"></span>
++							{objectAction action="delete" objectTitle=$question->getQuestion()}
  							
- 							{event name='columns'}
- 						</tr>
- 					{/foreach}
- 				{/content}
+ 							{event name='rowButtons'}
+ 						</td>
+ 						<td class="columnID columnQuestionID">{$question->questionID}</td>
+ 						<td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{$question->getQuestion()}</a></td>
+ 						
+ 						{event name='columns'}
+ 					</tr>
+ 				{/foreach}
  			</tbody>
  		</table>
  	</div>