diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
| commit | f0176b53934e78b830b890ef46c1e8e7c233bee4 (patch) | |
| tree | 9fc72119ba4003f15b06cd6cfd15d66790f6828f /phpBB/adm | |
| parent | 6f122d688660adbdb6284625c499216da3bf5ebf (diff) | |
| parent | e83c6cb61dcac9c8460e0e8fd22cb2f3324fb248 (diff) | |
| download | forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.gz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.bz2 forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.xz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.zip | |
Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
[ticket/12150] Use correct license URL in prune shadow migrations file
[ticket/12150] Remove 'after' for columns from migrations file
[ticket/12150] Update schema files for prune shadow topics
[ticket/12150] Use log service instead of add_log() function
[ticket/12150] Use shorter column names for prune settings
[ticket/12150] Add functional tests for pruning shadow topics
[ticket/12150] Add missing space to query for shadow topics
[ticket/12150] Add missing prune settings variables in acp_forums
[ticket/12150] Add file and caller for pruning shadow topics
[ticket/12150] Add prune columns to schema files and migration file
[ticket/12150] Add options to acp
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index e8b20007dc..0bb5e10f57 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -278,6 +278,19 @@ <dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> </dl> + <dl> + <dt><label for="enable_shadow_prune">{L_FORUM_PRUNE_SHADOW}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_EXPLAIN}</span></dt> + <dd><label><input type="radio" class="radio" name="enable_shadow_prune" value="1"<!-- IF S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> + </dl> + <dl> + <dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt> + <dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd> + </dl> + <dl> + <dt><label for="prune_shadow_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt> + <dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd> + </dl> </fieldset> </div> |