diff options
20 files changed, 152 insertions, 127 deletions
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 5b3d19c8b6..9a7a3e4b89 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -24,7 +24,7 @@ <dl> <dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt> <dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd> - <dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> + <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> <dl> <dt><label for="subject">{L_SUBJECT}:</label></dt> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 6025629ce1..40adf1ddf1 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -390,7 +390,7 @@ <!-- ENDIF --> <!-- IF S_RESYNCED --> - <script language="javascript" type="text/javascript"> + <script type="text/javascript"> <!-- var close_waitscreen = 1; //--> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 3d4e274228..1d3ed9c62f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -247,7 +247,7 @@ <dl> <dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt> <dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd> - <dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> + <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 5c7b9d6e7f..9e305e525c 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -72,7 +72,7 @@ <dl> <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="medium" type="text" id="username" name="username[]" /></dd> - <dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> + <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> </dl> </fieldset> @@ -135,7 +135,7 @@ <p>{L_USERNAMES_EXPLAIN}</p> <dl> <dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd> - <dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</div><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> + <dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> </dl> </fieldset> @@ -222,7 +222,7 @@ <dl> <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input type="text" id="username" name="username[]" /></dd> - <dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> + <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 11f022ecbc..77fbbdc764 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -13,7 +13,7 @@ <legend>{L_GENERAL_SEARCH_SETTINGS}</legend> <dl> <dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt> - <dd><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES} <input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd> + <dd><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> <dl> <dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 8ac3e0c96b..27bc628e4e 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -37,90 +37,80 @@ <h1>{L_TITLE}</h1> <p>{L_EXPLAIN}</p> - <script language="javascript" type="text/javascript" defer="defer"> + + <!-- IF SUCCESS --> + <div class="successbox"> + <p>{L_IMAGESET_UPDATED}</p> + </div> + <!-- ENDIF --> + + <!-- IF ERROR --> + <div class="errorbox"> + <p>{L_NO_IMAGE}</p> + </div> + <!-- ENDIF --> + + <script type="text/javascript" defer="defer"> <!-- function update_image(newimage) { - document.newimg.src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png"; + document.getElementById('newimg').src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png"; } //--> </script> + <form method="post" action="{U_ACTION}"> - - <table width="95%" cellspacing="1" cellpadding="1" border="0" align="center"> - <tr> - <td align="right">{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit(); "> + + <fieldset class="quick" style="text-align: left;"> + {L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();"> <!-- BEGIN category --> <option class="sep" value="">{category.NAME}</option> <!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>{category.images.TEXT}</option> <!-- END images --> <!-- END category --> - </select> <input class="btnlite" type="submit" value="{L_SELECT}" tabindex="100" /> - </td> - </tr> - <tr> - <td> - <table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> - <tr> - <th colspan="2">{L_EDIT_IMAGESET}</th> - </tr> - <!-- IF SUCCESS --> - <tr> - <td class="row1" colspan="2" align="center"><span style="color: green">{L_IMAGESET_UPDATED}</span><br /></td> - </tr> - <!-- ENDIF --> - <!-- IF ERROR --> - <tr> - <td class="row1" colspan="2" align="center"><span style="color: red">{L_NO_IMAGE}</span><br /></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="row1" colspan="2" align="center"> - <table width="100%" cellspacing="2" cellpadding="2" border="0"> - <tr> - <td width="50%" align="center"><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->"/></td> - <td width="50%" align="center"><img src="images/no_image.png" name="newimg" /></td> - </tr> - <tr> - <td class="gensmall" align="center">{L_CURRENT_IMAGE}</td> - <td class="gensmall" align="center">{L_SELECTED_IMAGE}</td> - </tr> - </table> - </td> - </tr> - <tr> - <th width="40%">{L_IMAGE_PARAMETER}</th> - <th>{L_IMAGE_VALUE}</th> - </tr> - <tr> - <td class="row1" width="40%"><b>{L_IMAGE}: </b></td> - <td class="row2"><select name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option> - <!-- BEGIN imagesetlist --> - <option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option> - <!-- BEGIN images --> - <option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option> - <!-- END images --> - <!-- END imagesetlist --> - </select> - </td> - </tr> - <tr> - <td class="row1" width="40%"><b>{L_INCLUDE_DIMENSIONS}: </b><br /><span class="gensmall">{L_DIMENSIONS_EXPLAIN}</span></td> - <td class="row2"><input type="radio" class="radio" name="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" /> <input class="btnmain" type="reset" value="{L_RESET}" /></td> - </tr> - </table> - </td> - </tr> - </table> - + </select> <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" /> + </fieldset> + + <fieldset> + <legend>{L_EDIT_IMAGESET}</legend> + <dl> + <dt><label>{L_CURRENT_IMAGE}:</label></dt> + <dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd> + </dl> + <dl> + <dt><label>{L_SELECTED_IMAGE}:</label></dt> + <dd><img src="images/no_image.png" id="newimg" alt="" /></dd> + </dl> + </fieldset> + + <fieldset> + <dl> + <dt><label for="imgpath">{L_IMAGE}:</label></dt> + <dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option> + <!-- BEGIN imagesetlist --> + <option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option> + <!-- BEGIN images --> + <option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option> + <!-- END images --> + <!-- END imagesetlist --> + </select> + </dd> + </dl> + <dl> + <dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt> + <dd><input type="radio" class="radio" name="imgsize" id="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> + </dl> + </fieldset> + + <fieldset class="submit-buttons"> + <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" value="{L_RESET}" /> + </fieldset> + </form> <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME --> - <script language="javascript" type="text/javascript" defer="defer"> + <script type="text/javascript" defer="defer"> <!-- function append_text_rows(form_name, value) { @@ -163,14 +153,14 @@ <legend>{L_SELECT_TEMPLATE}</legend> <dl> <dt><label for="template_file">{L_TEMPLATE_FILE}:</label></dt> - <dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="btnlite" type="submit" value="{L_SELECT}" /></dd> + <dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd> </dl> </fieldset> </form> <!-- IF TEMPLATE_FILE --> - <script language="javascript" type="text/javascript" defer="defer"> + <script type="text/javascript" defer="defer"> <!-- function change_editor_height(height) @@ -217,7 +207,7 @@ </dl> <dl> <dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> </dl> <textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea> </fieldset> @@ -232,15 +222,9 @@ <!-- ELSEIF S_EDIT_THEME --> - <script language="javascript" type="text/javascript"> + <script type="text/javascript"> <!-- - function swatch(field) - { - window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); - return false; - } - function change_editor_height(height) { editor = document.getElementById('css_data'); @@ -260,7 +244,7 @@ <p>{L_EDIT_THEME_EXPLAIN}</p> - <p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p> + <p>{L_SELECTED_THEME}: <strong>{SELECTED_THEME}</strong></p> <!-- IF S_SHOWCSS --> <h3>{L_SHOW_CSS_NOTE}</h3> @@ -273,7 +257,8 @@ <legend>{L_SELECT_CLASS}</legend> <dl> <dt><label for="css_class">{L_SELECT_CLASS}:</label></dt> - <dd><select id="css_class" name="css_class" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_CLASSES}</select> <input class="btnlite" type="submit" id="select_class" name="select_class" value="{L_SELECT}" /></dd> + <dd><select id="css_class" name="css_class" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_CLASSES}</select></dd> + <dd><input class="button1" type="submit" id="select_class" name="select_class" value="{L_SELECT}" /></dd> </dl> <!-- IF S_CLASS --> <dl> @@ -295,7 +280,7 @@ <legend>{L_THEME_EDITOR}</legend> <dl> <dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button1" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> </dl> <textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea> </fieldset> @@ -309,7 +294,7 @@ <dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> - <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td> + <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></dt> <dd><select id="background_image" name="background_image">{S_BACKGROUND_IMAGE}</select></dd> </dl> <dl> @@ -377,7 +362,7 @@ <fieldset> <legend>{L_CUSTOM_CLASS}</legend> <dl> - <dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt></dt> + <dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt> <dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd> </dl> </fieldset> @@ -392,7 +377,7 @@ <!-- ELSEIF S_CACHE --> - <script language="Javascript" type="text/javascript"> + <script type="text/javascript"> <!-- function viewsource(url) diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 1e3fe7190b..bc8da69997 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -15,7 +15,7 @@ <dl> <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="medium" type="text" id="username" name="username" /></dd> - <dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> + <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> </dl> </fieldset> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 0cdf9636e8..d5b3ff5f7e 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -83,20 +83,31 @@ function marklist(id, name, state) */ function trace(link) { - window.open(link, '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680'); + window.open(link.replace(/&/g, '&'), '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680'); return false; } -<!-- IF S_INCLUDE_SWATCH --> - /** - * Color swatch - */ - function swatch() - { - window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); - return false; - } -<!-- ENDIF --> +/** +* Find a member +*/ +function find_username() +{ + <!-- IF UA_FIND_USERNAME --> + window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); + <!-- ENDIF --> + return false; +} + +/** +* Color swatch +*/ +function swatch(field) +{ + <!-- IF UA_SWATCH --> + window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); + <!-- ENDIF --> + return false; +} //--> </script> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index b234ad6456..d555bc1443 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -73,16 +73,27 @@ function marklist(id, name, state) } } -<!-- IF S_INCLUDE_SWATCH --> - /** - * Color swatch - */ - function swatch() - { - window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); - return false; - } -<!-- ENDIF --> +/** +* Find a member +*/ +function find_username() +{ + <!-- IF UA_FIND_USERNAME --> + window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); + <!-- ENDIF --> + return false; +} + +/** +* Color swatch +*/ +function swatch(field) +{ + <!-- IF UA_SWATCH --> + window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); + <!-- ENDIF --> + return false; +} //--> </script> diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 5d452218b0..3744a967a6 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -31,8 +31,14 @@ $template->set_filenames(array( $template->assign_vars(array( 'OPENER' => addslashes(request_var('form', '')), 'NAME' => request_var('name', ''), - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/",) -); + 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", + + 'S_USER_LANG' => $user->lang['USER_LANG'], + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => 'UTF-8', + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], +)); $template->display('body'); diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 6b1eefe8e6..f858da6a16 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -457,7 +457,7 @@ class acp_search /** * @todo remove Javascript */ - return '<script language="javascript" type="text/javascript"> + return '<script type="text/javascript"> <!-- close_waitscreen = 1; //--> diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 436e3f017b..bc17e4b4ae 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -1068,6 +1068,7 @@ class auth_admin extends auth 'S_FIELD_NAME' => 'setting[' . $ug_id . '][' . $forum_id . '][' . $permission . ']', 'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '', + 'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '', 'PERMISSION' => $user->lang['acl_' . $permission]['lang']) ); diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index 988da577c0..8241db1c4f 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -230,8 +230,8 @@ function acp_ldap(&$new) <dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd> </dl> <dl> - <dt><label for="ldap_uid">' . $user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> - <dd><input type="text" id="ldap_uid" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd> + <dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> + <dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd> </dl> '; diff --git a/phpBB/styles/subSilver/template/mcp_notes_front.html b/phpBB/styles/subSilver/template/mcp_notes_front.html index 5422583d56..c43fad9465 100755 --- a/phpBB/styles/subSilver/template/mcp_notes_front.html +++ b/phpBB/styles/subSilver/template/mcp_notes_front.html @@ -2,7 +2,7 @@ <form method="post" name="mcp" action="{U_POST_ACTION}"> -<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th colspan="2"align="center">{L_SELECT_USER}</th> </tr> diff --git a/phpBB/styles/subSilver/template/mcp_warn_front.html b/phpBB/styles/subSilver/template/mcp_warn_front.html index d372a26fed..10897d5b7a 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_front.html +++ b/phpBB/styles/subSilver/template/mcp_warn_front.html @@ -2,7 +2,7 @@ <form method="post" name="mcp" action="{U_POST_ACTION}"> -<table class="bg" width="100%" cellspacing="1" border="0" align="center"> +<table class="tablebg" width="100%" cellspacing="1" border="0" align="center"> <tr> <th colspan="2"align="center">{L_SELECT_USER}</th> </tr> diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index 3035cb61b2..22833f0ab2 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -22,18 +22,18 @@ </style> <!-- ENDIF --> -<script language="Javascript" type="text/javascript"> +<script type="text/javascript"> <!-- <!-- IF S_USER_PM_POPUP --> if ({S_NEW_PM}) { - window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); + window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'height=225,resizable=yes,width=400'); } <!-- ENDIF --> function popup(url, width, height) { - window.open(url, '_popup', 'HEIGHT=' + height + ',resizable=yes,scrollbars=yes, WIDTH=' + width); + window.open(url.replace(/&/g, '&'), '_popup', 'HEIGHT=' + height + ',resizable=yes,scrollbars=yes, WIDTH=' + width); return false; } @@ -49,6 +49,17 @@ function jumpto() } } +/** +* Find a member +*/ +function find_username() +{ + <!-- IF UA_FIND_USERNAME --> + window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); + <!-- ENDIF --> + return false; +} + // Mark/unmark checkboxes // id = ID of parent container, name = name prefix, state = state [true/false] function marklist(id, name, state) diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index d5c745abea..6510b8f706 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -14,7 +14,7 @@ </script> <!-- IF S_CLOSE_PROGRESS_WINDOW --> - <script language="javascript" type="text/javascript"> + <script type="text/javascript"> <!-- close_waitscreen = 1; //--> diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html index ea8198565b..70952041e0 100644 --- a/phpBB/styles/subSilver/template/search_body.html +++ b/phpBB/styles/subSilver/template/search_body.html @@ -33,7 +33,7 @@ <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> <td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td> <td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> - <td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span> <input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</td> + <td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span> <input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</span></td> </tr> <tr> <td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td> diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index 51bd5a1567..c92e38f817 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -216,7 +216,7 @@ </tr> <tr> <td class="row1"><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td> - <td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</td> + <td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</td> </tr> <tr> <td class="cat" colspan="2" align="center"><input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /></td> diff --git a/phpBB/styles/subSilver/template/ucp_pm_options.html b/phpBB/styles/subSilver/template/ucp_pm_options.html index 491fd79591..05040e529a 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_options.html +++ b/phpBB/styles/subSilver/template/ucp_pm_options.html @@ -42,7 +42,7 @@ <!-- IF S_TEXT_CONDITION --> <input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" /> <!-- ELSEIF S_USER_CONDITION --> - <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" maxlength="50" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</span> + <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" maxlength="50" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> <!-- ELSEIF S_GROUP_CONDITION --> <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF --> <!-- ENDIF --> |