diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-21 20:47:44 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-21 20:47:44 -0500 |
| commit | e3c854288c6ef75b9fd92b97f9a90b71f3164724 (patch) | |
| tree | 23ed813f703dd840d713a50e838d34a640627552 /phpBB/adm | |
| parent | a89be371e8f32474c2eb83d86342523fbd9e865c (diff) | |
| parent | 15a5d2c4bf87918dc85aec84b9017226834572d7 (diff) | |
| download | forums-e3c854288c6ef75b9fd92b97f9a90b71f3164724.tar forums-e3c854288c6ef75b9fd92b97f9a90b71f3164724.tar.gz forums-e3c854288c6ef75b9fd92b97f9a90b71f3164724.tar.bz2 forums-e3c854288c6ef75b9fd92b97f9a90b71f3164724.tar.xz forums-e3c854288c6ef75b9fd92b97f9a90b71f3164724.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index cb4361dd6f..098cc723d9 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -22,6 +22,21 @@ <dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt> <dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd> </dl> + <!-- IF S_DELETE_STYLE --> + <hr /> + <dl> + <dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt> + <dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt> + <dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt> + <dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd> + </dl> + <!-- ENDIF --> <p class="quick"> <input class="button1" type="submit" name="update" value="{L_DELETE}" /> |