diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
| commit | 021c186be91095397d4e76801738373989360a52 (patch) | |
| tree | 4a5b42c0ebcaeb0be77edacb839bf164fe2dadc0 /phpBB/adm/style | |
| parent | 4f9c3b8f5c0181c2ebf367436f3c0336d8f2251d (diff) | |
| parent | 3ddedd5ff228cdcc3c0b05000affe3944afc7854 (diff) | |
| download | forums-021c186be91095397d4e76801738373989360a52.tar forums-021c186be91095397d4e76801738373989360a52.tar.gz forums-021c186be91095397d4e76801738373989360a52.tar.bz2 forums-021c186be91095397d4e76801738373989360a52.tar.xz forums-021c186be91095397d4e76801738373989360a52.zip | |
Merge commit 'release-3.0.6-RC1'
Diffstat (limited to 'phpBB/adm/style')
29 files changed, 624 insertions, 144 deletions
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 8a067cda66..12f2251ab5 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -18,6 +18,10 @@ <label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd> </dl> <dl> + <dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt> + <dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd> +</dl> +<dl> <dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt> <dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label> <label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd> @@ -25,69 +29,35 @@ <dl> <dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt> <dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label> - <label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd> -</dl> -<!-- IF GD --> -<dl> - <dt><label for="captcha_gd">{L_CAPTCHA_GD}:</label><br /><span>{L_CAPTCHA_GD_EXPLAIN}</span></dt> - <dd><label><input id="captcha_gd" name="captcha_gd" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input name="captcha_gd" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -</dl> -<dl> - <dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt> - <dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -</dl> -<dl> - <dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt> - <dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd> -</dl> -<dl> - <dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt> - <dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd> -</dl> -<dl> - <dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt> - <dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> -</dd> + <label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd> </dl> +</fieldset> + +<fieldset> +<legend>{L_AVAILABLE_CAPTCHAS}</legend> <dl> - <dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt> - <dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> -</dd> + <dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt> + <dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd> </dl> + <!-- IF S_CAPTCHA_HAS_CONFIG --> <dl> - <dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt> - <dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label> - <label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label> - <label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label> - -</dd> + <dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt> + <dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd> </dl> <!-- ENDIF --> - </fieldset> + +<!-- IF CAPTCHA_PREVIEW_TPL --> <fieldset> <legend>{L_PREVIEW}</legend> -<!-- IF PREVIEW --> - <div class="successbox"> - <h3>{L_WARNING}</h3> - <p>{L_CAPTCHA_PREVIEW_MSG}</p> - </div> -<!-- ENDIF --> -<dl> - <dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> - <dd><img src="{CAPTCHA_PREVIEW}" alt="{L_PREVIEW}" <!-- IF CAPTCHA_GD_PREVIEWED -->width="360" height="96"<!-- ELSE --> width="320" height="50"<!-- ENDIF --> id="captcha_preview" /></dd> -</dl> +<!-- INCLUDE {CAPTCHA_PREVIEW_TPL} --> </fieldset> +<!-- ENDIF --> <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> - <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> - <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> - <input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" /> + <input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" /> {S_FORM_TOKEN} </fieldset> </form> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 547ac66e3c..937a288cb2 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -218,6 +218,11 @@ <label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> </dl> <dl> + <dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt> + <dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> + </dl> + <dl> <dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt> <dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label> <label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html new file mode 100644 index 0000000000..73d9e70918 --- /dev/null +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -0,0 +1,21 @@ +<!-- INCLUDE overall_header.html --> + +<form id="confirm" method="post" action="{S_COPY_ACTION}"> + +<fieldset> + <h1>{L_COPY_PERMISSIONS}</h1> + <p>{L_COPY_PERMISSIONS_EXPLAIN}</p> + <p>{L_ACL_LINK}</p> + <dl> + <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> + </dl> + <div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS} + <input type="submit" name="update" value="{L_CONTINUE}" class="button2" /> + </div> + +</fieldset> + +</form> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 5df8a16a39..a513e69a8a 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -55,21 +55,29 @@ </fieldset> <fieldset> - <legend>{L_GROUP_SETTINGS_SAVE}</legend> + <legend>{L_GROUP_OPTIONS_SAVE}</legend> <!-- IF S_USER_FOUNDER --> <dl> <dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt> - <dd><input name="group_founder_manage" type="checkbox" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd> + <dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd> </dl> <!-- ENDIF --> <dl> + <dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt> + <dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd> + </dl> + <dl> <dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt> - <dd><input name="group_legend" type="checkbox" class="radio" id="group_legend"{GROUP_LEGEND} /></dd> + <dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd> </dl> <dl> <dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt> - <dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> + <dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> </dl> + </fieldset> + + <fieldset> + <legend>{L_GROUP_SETTINGS_SAVE}</legend> <dl> <dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> <dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> @@ -80,7 +88,7 @@ </dl> <dl> <dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> - <dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> <span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + <dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}"> </span><!-- ENDIF --> <span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> @@ -97,7 +105,7 @@ </dl> <!-- IF not S_IN_AVATAR_GALLERY --> <!-- IF S_CAN_UPLOAD --> - <dl> + <dl> <dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> <dd><input type="file" id="uploadfile" name="uploadfile" /></dd> </dl> @@ -115,7 +123,7 @@ <dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd> </dl> <!-- IF S_DISPLAY_GALLERY --> - <dl> + <dl> <dt><label>{L_AVATAR_GALLERY}:</label></dt> <dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd> </dl> @@ -132,7 +140,7 @@ <dl> <table cellspacing="1"> <!-- BEGIN avatar_row --> - <tr> + <tr> <!-- BEGIN avatar_column --> <td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> <!-- END avatar_column --> @@ -146,11 +154,11 @@ </table> </dl> </fieldset> - + <fieldset class="quick" style="margin-top: -15px;"> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> </fieldset> - + <!-- ENDIF --> </fieldset> @@ -192,7 +200,7 @@ </tr> <!-- BEGIN leader --> <!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a></td> + <td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td> <td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> <td style="text-align: center;">{leader.JOINED}</td> <td style="text-align: center;">{leader.USER_POSTS}</td> @@ -213,7 +221,7 @@ </tr> <!-- ELSE --> <!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{member.U_USER_EDIT}">{member.USERNAME}</a></td> + <td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td> <td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> <td style="text-align: center;">{member.JOINED}</td> <td style="text-align: center;">{member.USER_POSTS}</td> @@ -231,12 +239,12 @@ <div class="pagination"> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> </div> - <!-- ENDIF --> + <!-- ENDIF --> <fieldset class="quick"> <select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /> - <p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> + <p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> </fieldset> <h1>{L_ADD_USERS}</h1> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 86500ae047..10166fec35 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -243,8 +243,8 @@ <td style="text-align: center;">{items.EMOTION}</td> <!-- ENDIF --> <td style="text-align: right; white-space: nowrap;"> - <!-- IF items.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF --> - <!-- IF items.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> + <!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF --> + <!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a> </td> </tr> @@ -255,7 +255,7 @@ <!-- END items --> </tbody> </table> - + <div>{PAGINATION}</div> <p class="quick"> <input class="button2" name="add" type="submit" value="{L_ICON_ADD}" /> <input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" /> </p> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 240cec1643..ca65416421 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -12,7 +12,7 @@ <!-- IF PAGINATION --> <div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> </div> <!-- ENDIF --> @@ -22,8 +22,8 @@ <th>{L_USERNAME}</th> <th>{L_JOINED}</th> <th>{L_INACTIVE_DATE}</th> - <th>{L_INACTIVE_REASON}</th> <th>{L_LAST_VISIT}</th> + <th>{L_INACTIVE_REASON}</th> <th>{L_MARK}</th> </tr> </thead> @@ -31,11 +31,16 @@ <!-- BEGIN inactive --> <!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td> - <td>{inactive.JOINED}</td> - <td>{inactive.INACTIVE_DATE}</td> - <td>{inactive.REASON}</td> - <td>{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.USERNAME_FULL} + <!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> + </td> + <td style="vertical-align: top;">{inactive.JOINED}</td> + <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> + <td style="vertical-align: top;">{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.REASON} + <!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF --> <td> <input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" /> </td> </tr> <!-- BEGINELSE --> @@ -46,25 +51,25 @@ </tbody> </table> - <fieldset class="display-options"> - {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - <input class="button2" type="submit" value="{L_GO}" name="sort" /> - </fieldset> - <hr /> - <!-- IF PAGINATION --> - <div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - </div> - <!-- ENDIF --> +<fieldset class="display-options"> + {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION --> Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> + <input class="button2" type="submit" value="{L_GO}" name="sort" /> +</fieldset> - <fieldset class="quick"> - <select name="action">{S_INACTIVE_OPTIONS}</select> - <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> - <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> - {S_FORM_TOKEN} - </fieldset> +<hr /> +<!-- IF PAGINATION --> + <div class="pagination"> + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> + </div> +<!-- ENDIF --> +<fieldset class="quick"> + <select name="action">{S_INACTIVE_OPTIONS}</select> + <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> + <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> + {S_FORM_TOKEN} +</fieldset> </form> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 11ab5faa9c..6e93dba940 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -8,12 +8,18 @@ <form id="list" method="post" action="{U_ACTION}"> +<fieldset class="display-options" style="float: left"> + {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +</fieldset> + <!-- IF PAGINATION --> -<div class="pagination"> +<div class="pagination" style="float: right; margin: 15px 0 2px 0"> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> </div> <!-- ENDIF --> +<div class="clearfix"> </div><br style="clear: both;" /> + <!-- IF .log --> <table cellspacing="1"> <thead> @@ -22,13 +28,14 @@ <th>{L_IP}</th> <th>{L_TIME}</th> <th>{L_ACTION}</th> - <th>{L_MARK}</th> + <!-- IF S_CLEARLOGS --> + <th>{L_MARK}</th> + <!-- ENDIF --> </tr> </thead> <tbody> <!-- BEGIN log --> <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td> {log.USERNAME} <!-- IF log.REPORTEE_USERNAME --> @@ -38,32 +45,33 @@ <td style="text-align: center;">{log.IP}</td> <td style="text-align: center;">{log.DATE}</td> <td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td> - <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td> + <!-- IF S_CLEARLOGS --> + <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td> + <!-- ENDIF --> </tr> <!-- END log --> </tbody> </table> -<!-- ELSE --> +<!-- IF PAGINATION --> + <div class="pagination"> + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> + </div> +<!-- ENDIF --> +<!-- ELSE --> <div class="errorbox"> <p>{L_NO_ENTRIES}</p> </div> - <!-- ENDIF --> - <fieldset class="display-options"> {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} <input class="button2" type="submit" value="{L_GO}" name="sort" /> {S_FORM_TOKEN} </fieldset> <hr /> -<!-- IF PAGINATION --> -<div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -</div> -<!-- ENDIF --> + <!-- IF S_SHOW_FORUMS --> <fieldset class="quick"> {L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> @@ -71,7 +79,7 @@ </fieldset> <!-- ENDIF --> -<!-- IF S_CLEARLOGS --> +<!-- IF .log and S_CLEARLOGS --> <fieldset class="quick"> <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br /> @@ -79,7 +87,6 @@ </fieldset> <!-- ENDIF --> - </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4b6bc1910d..139dc825c1 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,6 +14,19 @@ <p>{L_ADMIN_INTRO}</p> + <!-- IF S_VERSIONCHECK_FAIL --> + <div class="errorbox notice"> + <p>{L_VERSIONCHECK_FAIL}</p> + <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> + </div> + <!-- ELSEIF not S_VERSION_UP_TO_DATE --> + <div class="errorbox"> + <p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p> + <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> + </div> + <!-- ENDIF --> + + <!-- IF S_REMOVE_INSTALL --> <div class="errorbox"> <h3>{L_WARNING}</h3> @@ -85,7 +98,9 @@ </tr> <tr> <td>{L_BOARD_VERSION}: </td> - <td><strong>{BOARD_VERSION}</strong></td> + <td> + <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ] + </td> <!-- IF S_TOTAL_ORPHAN --> <td>{L_NUMBER_ORPHAN}: </td> <td><strong>{TOTAL_ORPHAN}</strong></td> @@ -137,6 +152,12 @@ </form> <!-- IF S_FOUNDER --> + <form id="action_purge_sessions_form" method="post" action="{U_ACTION}"> + <dl> + <dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt> + <dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd> + </dl> + </form> <form id="action_purge_cache_form" method="post" action="{U_ACTION}"> <dl> <dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt> @@ -193,19 +214,24 @@ <th>{L_USERNAME}</th> <th>{L_JOINED}</th> <th>{L_INACTIVE_DATE}</th> - <th>{L_INACTIVE_REASON}</th> <th>{L_LAST_VISIT}</th> + <th>{L_INACTIVE_REASON}</th> </tr> </thead> <tbody> <!-- BEGIN inactive --> <!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td> - <td>{inactive.JOINED}</td> - <td>{inactive.INACTIVE_DATE}</td> - <td>{inactive.REASON}</td> - <td>{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.USERNAME_FULL} + <!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> + </td> + <td style="vertical-align: top;">{inactive.JOINED}</td> + <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> + <td style="vertical-align: top;">{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.REASON} + <!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF --> </tr> <!-- BEGINELSE --> <tr> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index a2dcc4ebbd..85d37568c2 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -56,6 +56,10 @@ <dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd> </dl> <dl> + <dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt> + <dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> <dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt> <dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd> </dl> @@ -127,7 +131,7 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" /> </fieldset> - + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -151,15 +155,15 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" /> </fieldset> - + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} <input class="button1" type="submit" name="save" value="{L_SAVE}" /> {S_FORM_TOKEN} </fieldset> - + <!-- ENDIF --> - + </form> <!-- ELSE --> @@ -194,14 +198,14 @@ {ICON_MOVE_UP_DISABLED} <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW--> - <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> - <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> + <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> + <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW --> <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> - {ICON_MOVE_DOWN_DISABLED} + {ICON_MOVE_DOWN_DISABLED} <!-- ENDIF --> <!-- IF not fields.S_NEED_EDIT --> - <a href="{fields.U_EDIT}">{ICON_EDIT}</a> + <a href="{fields.U_EDIT}">{ICON_EDIT}</a> <!-- ELSE --> {ICON_EDIT_DISABLED} <!-- ENDIF --> @@ -209,12 +213,16 @@ </td> </tr> + <!-- BEGINELSE --> + <tr class="row3"> + <td colspan="4">{L_ACP_NO_ITEMS}</td> + </tr> <!-- END fields --> </tbody> </table> <form id="profile_fields" method="post" action="{U_ACTION}"> - + <fieldset class="quick"> <input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select> <input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" /> diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html new file mode 100644 index 0000000000..2a9b61f314 --- /dev/null +++ b/phpBB/adm/style/acp_send_statistics.html @@ -0,0 +1,71 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + +<h1>{L_SEND_STATISTICS}</h1> + +<p>{L_EXPLAIN_SEND_STATISTICS}</p> + +<script type="text/javascript"> +//<![CDATA[ +var iframect = 0; + +function iframe_updated() +{ + if (iframect++ == 0) + { + return; + } + + dE('questionnaire-form', -1); + dE('questionnaire-thanks', 1); +} +//]]> +</script> + +<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe> + +<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form"> + + <p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p> + + <p>{L_EXPLAIN_SHOW_STATISTICS}</p> + + <p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p> + + <div id="configlist"> + <input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" /> + <p class="submit-buttons"> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" /> + </p> + + <!-- BEGIN providers --> + <fieldset> + <legend>{providers.NAME}</legend> + <!-- BEGIN values --> + <dl> + <dt>{providers.values.KEY}</dt> + <dd>{providers.values.VALUE}</dd> + </dl> + <!-- END values --> + </fieldset> + <!-- END providers --> + </div> + <p class="submit-buttons"> + <input type="hidden" name="systemdata" value="{RAW_DATA}" /> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" /> + </p> +</form> + +<div id="questionnaire-thanks" class="successbox"> + <p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">« {L_GO_ACP_MAIN}</a></p> +</div> + +<script type="text/javascript"> +//<![CDATA[ + dE('configlist', -1); + dE('questionnaire-thanks', -1); +//]]> +</script> + +<!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index e82aee0e87..34d4f6934e 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -10,11 +10,11 @@ <!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO --> <div class="successbox"> - <p>{L_VERSION_UP_TO_DATE_ACP}</p> + <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> <!-- ELSE --> <div class="errorbox"> - <p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p> + <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 34e4147356..e266654649 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -83,6 +83,10 @@ <!-- INCLUDE acp_users_feedback.html --> +<!-- ELSEIF S_WARNINGS --> + +<!-- INCLUDE acp_users_warnings.html --> + <!-- ELSEIF S_PROFILE --> <!-- INCLUDE acp_users_profile.html --> @@ -131,8 +135,8 @@ <!-- ELSE --> <!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td> - <td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td> - <td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE --> <!-- ENDIF --></td> + <td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE --> <!-- ENDIF --></td> + <td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE --> <!-- ENDIF --></td> <td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td> </tr> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 20b5b60050..deed41e16e 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -8,11 +8,13 @@ <dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd> </dl> <!-- IF not S_IN_AVATAR_GALLERY --> - <!-- IF S_CAN_UPLOAD --> + <!-- IF S_UPLOAD_FILE --> <dl> <dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd> </dl> + <!-- ENDIF --> + <!-- IF S_REMOTE_UPLOAD --> <dl> <dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> <dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 239d35f119..0ea5328c3c 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -93,7 +93,7 @@ // ]]> </script> </dt> - <dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd> + <dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd> <dd style="margin-left: 90px; margin-top: 5px;"> <!-- IF S_BBCODE_ALLOWED --> <label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label> diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html new file mode 100644 index 0000000000..be9ef06825 --- /dev/null +++ b/phpBB/adm/style/acp_users_warnings.html @@ -0,0 +1,39 @@ + <form id="list" method="post" action="{U_ACTION}"> + + <!-- IF .warn --> + <table cellspacing="1"> + <thead> + <tr> + <th>{L_REPORT_BY}</th> + <th>{L_TIME}</th> + <th>{L_FEEDBACK}</th> + <!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF --> + </tr> + </thead> + <tbody> + <!-- BEGIN warn --> + <!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td>{warn.USERNAME}</td> + <td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td> + <td>{warn.ACTION}</td> + <!-- IF S_CLEARLOGS --><td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td><!-- ENDIF --> + </tr> + <!-- END warn --> + </tbody> + </table> + <!-- ELSE --> + <div class="errorbox"> + <p>{L_NO_WARNINGS}</p> + </div> + <!-- ENDIF --> + + <!-- IF S_CLEARLOGS --> + <fieldset class="quick"> + <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> + <p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p> + </fieldset> + <!-- ENDIF --> + {S_FORM_TOKEN} + </form> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 344b5cacf0..ad15036daa 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -121,6 +121,17 @@ a:active { font-weight: bold; } +/* List items */ +ul, ol { + list-style-position: inside; + margin-left: 1em; +} + +li { + display: list-item; + list-style-type: inherit; +} + /* Main blocks ---------------------------------------- */ #wrap { @@ -184,6 +195,7 @@ a:active { width: 76%; margin: 0 0 0 3%; min-height: 350px; + overflow-y: auto; } .rtl #main { diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html new file mode 100644 index 0000000000..0b1434f7e0 --- /dev/null +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -0,0 +1,4 @@ +<dl> + <dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> + <dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd> +</dl> diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html new file mode 100644 index 0000000000..be715401db --- /dev/null +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -0,0 +1,72 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + <a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> + +<h1>{L_ACP_VC_SETTINGS}</h1> + +<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p> + + +<form id="acp_captcha" method="post" action="{U_ACTION}"> + +<fieldset> +<legend>{L_GENERAL_OPTIONS}</legend> + +<dl> + <dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt> + <dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> +</dl> +<dl> + <dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt> + <dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd> +</dl> +<dl> + <dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt> + <dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd> +</dl> +<dl> + <dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt> + <dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +</dd> +</dl> +<dl> + <dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt> + <dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +</dd> +</dl> +<dl> + <dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt> + <dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label> + <label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label> + <label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label> + +</dd> +</dl> + +</fieldset> +<fieldset> + <legend>{L_PREVIEW}</legend> + <!-- IF CAPTCHA_PREVIEW --> + <!-- INCLUDE {CAPTCHA_PREVIEW} --> + <!-- ENDIF --> + +</fieldset> + +<fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + <input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" /> + + <input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" /> + <input type="hidden" name="configure" value="1" /> + + {S_FORM_TOKEN} +</fieldset> +</form> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html new file mode 100644 index 0000000000..e0fc6fc67e --- /dev/null +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -0,0 +1,92 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + + + <a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> + + <h1>{L_QUESTIONS}</h1> + + <p>{L_QUESTIONS_EXPLAIN}</p> +<!-- IF S_LIST --> + <form id="captcha_qa" method="post" action="{U_ACTION}"> + + <fieldset class="tabulated"> + <legend>{L_QUESTIONS}</legend> + + <table cellspacing="1"> + <thead> + <tr> + <th colspan="3">{L_QUESTIONS}</th> + </tr> + <tr class="row3"> + <td style="text-align: center;">{L_QUESTION_TEXT}</td> + <td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td> + <td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td> + </tr> + </thead> + <tbody> + <!-- BEGIN questions --> + + <!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td style="text-align: left;">{questions.QUESTION_TEXT}</td> + <td style="text-align: center;">{questions.QUESTION_LANG}</td> + <td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a> <a href="{questions.U_DELETE}">{ICON_DELETE}</a></td> + </tr> + <!-- END questions --> + </tbody> + </table> + <fieldset class="quick"> + <input class="button1" type="submit" name="add" value="{L_ADD}" /> + <input type="hidden" name="action" value="add" /> + <input type="hidden" name="configure" value="1" /> + <input type="hidden" name="select_captcha" value="{CLASS}" /> + + {S_FORM_TOKEN} + </fieldset> + {S_FORM_TOKEN} + </fieldset> + </form> +<!-- ELSE --> + <!-- IF S_ERROR --> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{L_QA_ERROR_MSG}</p> + </div> + <!-- ENDIF --> + <form id="captcha_qa" method="post" action="{U_ACTION}"> + <fieldset> + <legend>{L_EDIT_QUESTION}</legend> + <dl> + <dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt> + <dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> + </dl> + + <dl> + <dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt> + <dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd> + </dl> + <dl> + <dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt> + <dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd> + </dl> + <dl> + <dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt> + <dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd> + </dl> + </fieldset> + <fieldset class="quick"> + <input class="button1" type="submit" name="submit" value="{L_SUBMIT}" /> + <input type="hidden" name="question_id" value="{QUESTION_ID}" /> + <input type="hidden" name="action" value="add" /> + <input type="hidden" name="configure" value="1" /> + <input type="hidden" name="select_captcha" value="{CLASS}" /> + + {S_FORM_TOKEN} + </fieldset> + </form> +<!-- ENDIF --> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html new file mode 100644 index 0000000000..57bed8af53 --- /dev/null +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -0,0 +1,7 @@ +<dl> + <dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> + + <dd> + <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> + </dd> +</dl> diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html new file mode 100644 index 0000000000..93fc6e7499 --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -0,0 +1,25 @@ +<!-- IF S_RECAPTCHA_AVAILABLE --> + <dl> + <dd> + <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> + // <![CDATA[ + var RecaptchaOptions = { + lang : {L_RECAPTCHA_LANG} + }; + // ]]> + </script> + + + <noscript> + <div> + <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> + </div> + </noscript> + + </dd> + </dl> +<!-- ELSE --> +{L_RECAPTCHA_NOT_AVAILABLE} +<!-- ENDIF --> diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html new file mode 100644 index 0000000000..fba59a9647 --- /dev/null +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -0,0 +1,48 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + +<h1>{L_ACP_VC_SETTINGS}</h1> + +<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p> + + +<form id="acp_captcha" method="post" action="{U_ACTION}"> + +<fieldset> +<legend>{L_GENERAL_OPTIONS}</legend> + +<dl> + <dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt> + <dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd> +</dl> +<dl> + <dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt> + <dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd> +</dl> + + +</fieldset> +<fieldset> + <legend>{L_PREVIEW}</legend> +<!-- IF PREVIEW --> + <div class="successbox"> + <h3>{L_WARNING}</h3> + <p>{L_CAPTCHA_PREVIEW_MSG}</p> + </div> +<!-- ENDIF --> +<!-- INCLUDE {CAPTCHA_PREVIEW} --> +</fieldset> + +<fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + <input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" /> + <input type="hidden" name="configure" value="1" /> + + {S_FORM_TOKEN} +</fieldset> +</form> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 93d0059609..cd4e75f51f 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -16,7 +16,6 @@ var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == - var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); var baseHeight; -window.onload = initInsertions; /** * Shows the help messages in the helpline window @@ -259,7 +258,7 @@ function addquote(post_id, username) */ function mozWrap(txtarea, open, close) { - var selLength = txtarea.textLength; + var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength; var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; var scrollTop = txtarea.scrollTop; diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 2ec3581ef4..4df43eaaa0 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -2,6 +2,7 @@ </div> </div> <span class="corners-bottom"><span></span></span> + <div class="clear"></div> </div> </div> </div> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index a5a0f8b5b6..4b89537acb 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -219,8 +219,7 @@ <!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF --> </dt> <dd style="margin-left: 60%;"> - <!-- IF not new.S_BINARY -->[ <a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a> - <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> + <!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> </dd> <!-- IF new.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> @@ -243,7 +242,7 @@ <dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong> <!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> </dt> - <dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[ <a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> + <dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> <!-- IF not_modified.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> <!-- ENDIF --> @@ -271,7 +270,7 @@ </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> - <dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[ <a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> + <dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> @@ -298,8 +297,7 @@ <!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> </dt> <dd style="margin-left: 60%;"> - <!-- IF not new_conflict.S_BINARY -->[ <a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a> - <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> + <!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> </dd> <!-- IF new_conflict.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> @@ -323,7 +321,7 @@ <!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF --> </dt> <dd style="margin-left: 60%;"> - <!-- IF not conflict.S_BINARY -->[ <a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a> ]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN} + <!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN} <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> </dd> <!-- IF conflict.S_CUSTOM --> @@ -396,7 +394,7 @@ <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} - <input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> + <input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> </fieldset> </form> @@ -462,7 +460,7 @@ </dl> <!-- END data --> </fieldset> - + <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} <input class="button2" type="submit" name="check_again" value="{L_BACK}" /> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index efbe1d045c..d794c5c516 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -28,6 +28,9 @@ function resize_panel() //whatever IE needs to do this } } + +window.onresize = resize_panel; + // ]]> </script> @@ -48,10 +51,7 @@ function resize_panel() <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> div#codepanel { - overflow: auto; width: 100%; - height: 350px; - display: inline-block; } <!-- ELSE --> div#codepanel { @@ -59,12 +59,22 @@ div#codepanel { } <!-- ENDIF --> +<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' --> +div#diff_content pre { + overflow: auto; + height: 414px; + width: 100% !important; +} +<!-- ENDIF --> + <!-- IF not S_DIFF_NEW_FILE --> /** * Unified Diff */ .file { line-height: .7em; + overflow: auto; + height: 414px; } .diff { @@ -203,9 +213,8 @@ table.hrdiff caption span { </head> - <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> -<body onresize="resize_panel();" onload="resize_panel();"> +<body onload="resize_panel();"> <!-- ELSE --> <body> <!-- ENDIF --> @@ -220,7 +229,7 @@ table.hrdiff caption span { <!-- ENDIF --> <!-- IF not S_DIFF_NEW_FILE --> <p id="skip"><a href="#acp">{L_SKIP}</a></p> - <form method="post"> + <form method="post" action=""> <fieldset class="quick"> <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index d5316aae08..8af299ad57 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -2,6 +2,7 @@ </div> </div> <span class="corners-bottom"><span></span></span> + <div class="clear"></div> </div> </div> </div> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index ccf38e49b8..a376884507 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -194,21 +194,27 @@ function switch_menu() <div id="menu"> <p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ][ <a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a> ] </p> <ul> + <!-- DEFINE $LI_USED = 0 --> <!-- BEGIN l_block1 --> <!-- IF l_block1.S_SELECTED --> <!-- BEGIN l_block2 --> <!-- IF .l_block1.l_block2.l_block3 --> <li class="header">{l_block1.l_block2.L_TITLE}</li> + <!-- DEFINE $LI_USED = 1 --> <!-- ENDIF --> <!-- BEGIN l_block3 --> <li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li> + <!-- DEFINE $LI_USED = 1 --> <!-- END l_block3 --> <!-- END l_block2 --> <!-- ENDIF --> <!-- END l_block1 --> + <!-- IF not $LI_USED --> + <li></li> + <!-- ENDIF --> </ul> </div> diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html new file mode 100644 index 0000000000..c919310035 --- /dev/null +++ b/phpBB/adm/style/permission_forum_copy.html @@ -0,0 +1,40 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + + <h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1> + + {L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN} + + <form id="forum_perm_copy" method="post" action="{U_ACTION}"> + + <fieldset> + <legend>{L_LOOK_UP_FORUM}</legend> + + <dl> + <dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt> + <dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd> + </dl> + </fieldset> + + <fieldset> + <legend>{L_LOOK_UP_FORUM}</legend> + <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p> + + <dl> + <dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt> + <dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd> + </dl> + </fieldset> + + <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} + </fieldset> + + </form> + +<!-- INCLUDE overall_footer.html --> |