Menu
▾
▴
[Phpbb-checkins] phpBB2/adm/style acp_attachments.html, 1.20, 1.21 acp_ban.html, 1.17, 1.18 acp_database.html, 1.12, 1.13 acp_email.html, 1.8, 1.9 acp_forums.html, 1.41, 1.42 acp_groups.html, 1.28, 1.29 acp_icons.html, 1.18, 1.19 acp_modules.html, 1.22, 1.23 acp_permission_roles.html, 1.25, 1.26 acp_permissions.html, 1.21, 1.22 acp_prune_users.html, 1.6, 1.7 acp_ranks.html, 1.10, 1.11 acp_search.html, 1.18, 1.19 acp_styles.html, 1.36, 1.37 acp_users.html, 1.45, 1.46 acp_users_overview.html, 1.10, 1.11 acp_users_prefs.html, 1.5, 1.6 acp_users_signature.html, 1.7, 1.8 colour_swatch.html, 1.4, 1.5 install_update.html, 1.18, 1.19 install_update_diff.html, 1.10, 1.11 overall_header.html, 1.23, 1.24 permission_mask.html, 1.31, 1.32 progress_bar.html, 1.1, 1.2 simple_header.html, 1.13, 1.14
Update of /cvsroot/phpbb/phpBB2/adm/style In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9056/adm/style Modified Files: acp_attachments.html acp_ban.html acp_database.html acp_email.html acp_forums.html acp_groups.html acp_icons.html acp_modules.html acp_permission_roles.html acp_permissions.html acp_prune_users.html acp_ranks.html acp_search.html acp_styles.html acp_users.html acp_users_overview.html acp_users_prefs.html acp_users_signature.html colour_swatch.html install_update.html install_update_diff.html overall_header.html permission_mask.html progress_bar.html simple_header.html Log Message: #i62 - #i65 gone through every javascript invocation and making sure we adhere to our coding guidelines. Index: acp_permissions.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_permissions.html,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** acp_permissions.html 26 Jul 2007 15:49:43 -0000 1.21 --- acp_permissions.html 22 Sep 2007 18:28:19 -0000 1.22 *************** *** 75,79 **** <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username[]" /></dd> ! <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> --- 75,79 ---- <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username[]" /></dd> ! <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> *************** *** 139,143 **** <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: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> </fieldset> --- 139,143 ---- <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: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> </fieldset> *************** *** 226,230 **** <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="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> --- 226,230 ---- <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="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> *************** *** 328,334 **** <script type="text/javascript" src="style/tooltip.js"></script> <script type="text/javascript"> ! <!-- window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')}; ! //--> </script> --- 328,334 ---- <script type="text/javascript" src="style/tooltip.js"></script> <script type="text/javascript"> ! // <![CDATA[ window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')}; ! // ]]> </script> Index: acp_attachments.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_attachments.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** acp_attachments.html 26 Jul 2007 15:49:43 -0000 1.20 --- acp_attachments.html 22 Sep 2007 18:28:19 -0000 1.21 *************** *** 118,123 **** <!-- IF S_EDIT_GROUP --> <script type="text/javascript" defer="defer"> ! <!-- ! function update_image(newimage) { --- 118,122 ---- <!-- IF S_EDIT_GROUP --> <script type="text/javascript" defer="defer"> ! // <![CDATA[ function update_image(newimage) { *************** *** 164,168 **** } ! //--> </script> --- 163,167 ---- } ! // ]]> </script> Index: progress_bar.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/progress_bar.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** progress_bar.html 30 Sep 2006 14:58:04 -0000 1.1 --- progress_bar.html 22 Sep 2007 18:28:19 -0000 1.2 *************** *** 2,6 **** <script type="text/javascript"> ! <!-- /** * Close previously opened popup --- 2,6 ---- <script type="text/javascript"> ! // <![CDATA[ /** * Close previously opened popup *************** *** 23,27 **** return 0; } ! //--> </script> --- 23,27 ---- return 0; } ! // ]]> </script> *************** *** 33,39 **** <script type="text/javascript"> ! <!-- close_popup(); ! //--> </script> --- 33,39 ---- <script type="text/javascript"> ! // <![CDATA[ close_popup(); ! // ]]> </script> Index: acp_modules.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_modules.html,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** acp_modules.html 26 Jul 2007 15:49:43 -0000 1.22 --- acp_modules.html 22 Sep 2007 18:28:19 -0000 1.23 *************** *** 6,11 **** <script type="text/javascript"> ! <!-- ! function display_options(value) { --- 6,10 ---- <script type="text/javascript"> ! // <![CDATA[ function display_options(value) { *************** *** 39,43 **** <!-- BEGIN m_names --> ! if (value == '{m_names.NAME}') { <!-- BEGIN modes --> --- 38,42 ---- <!-- BEGIN m_names --> ! if (value == '{m_names.A_NAME}') { <!-- BEGIN modes --> *************** *** 53,57 **** } ! //--> </script> --- 52,56 ---- } ! // ]]> </script> Index: acp_forums.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_forums.html,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** acp_forums.html 7 Sep 2007 14:01:18 -0000 1.41 --- acp_forums.html 22 Sep 2007 18:28:19 -0000 1.42 *************** *** 6,11 **** <script type="text/javascript"> ! <!-- ! /** * Handle displaying/hiding several options based on the forum type --- 6,10 ---- <script type="text/javascript"> ! // <![CDATA[ /** * Handle displaying/hiding several options based on the forum type *************** *** 93,97 **** } ! //--> </script> --- 92,96 ---- } ! // ]]> </script> *************** *** 369,378 **** <script type="text/javascript"> ! <!-- ! var close_waitscreen = 0; ! window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400'); ! ! //--> </script> --- 368,376 ---- <script type="text/javascript"> ! // <![CDATA[ var close_waitscreen = 0; ! // no scrollbars... ! popup('{UA_PROGRESS_BAR}', 400, 240, '_sync'); ! // ]]> </script> *************** *** 386,391 **** <script type="text/javascript"> ! <!-- ! /** * Popup search progress bar --- 384,388 ---- <script type="text/javascript"> ! // <![CDATA[ /** * Popup search progress bar *************** *** 394,401 **** { var close_waitscreen = 0; ! window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400'); } ! ! //--> </script> --- 391,398 ---- { var close_waitscreen = 0; ! // no scrollbars... ! popup('{UA_PROGRESS_BAR}', 400, 240, '_sync'); } ! // ]]> </script> *************** *** 413,419 **** <!-- IF S_RESYNCED --> <script type="text/javascript"> ! <!-- var close_waitscreen = 1; ! //--> </script> --- 410,416 ---- <!-- IF S_RESYNCED --> <script type="text/javascript"> ! // <![CDATA[ var close_waitscreen = 1; ! // ]]> </script> Index: acp_users_prefs.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_users_prefs.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** acp_users_prefs.html 6 May 2007 15:30:14 -0000 1.5 --- acp_users_prefs.html 22 Sep 2007 18:28:19 -0000 1.6 *************** *** 1,2 **** --- 1,8 ---- + <script type="text/javascript"> + // <![CDATA[ + var default_dateformat = '{A_DEFAULT_DATEFORMAT}'; + // ]]> + </script> + <form id="user_prefs" method="post" action="{U_ACTION}"> *************** *** 58,62 **** <dl> <dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> ! <dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd> <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd> </dl> --- 64,68 ---- <dl> <dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> ! <dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd> <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd> </dl> Index: acp_icons.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_icons.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** acp_icons.html 3 Aug 2007 12:05:51 -0000 1.18 --- acp_icons.html 22 Sep 2007 18:28:19 -0000 1.19 *************** *** 6,10 **** <script type="text/javascript" defer="defer"> ! <!-- <!-- IF S_ADD_CODE --> --- 6,10 ---- <script type="text/javascript" defer="defer"> ! // <![CDATA[ <!-- IF S_ADD_CODE --> *************** *** 23,27 **** var use_element = smiley[newimage]; ! document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + newimage; document.getElementById('add_code').value = use_element['code']; document.getElementById('add_emotion').value = use_element['emotion']; --- 23,27 ---- var use_element = smiley[newimage]; ! document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage); document.getElementById('add_code').value = use_element['code']; document.getElementById('add_emotion').value = use_element['emotion']; *************** *** 61,68 **** } } ! //--> </script> - <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> --- 61,67 ---- } } ! // ]]> </script> <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> *************** *** 113,117 **** <td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td> <td> ! <input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.IMG}', this.checked, 'order[{items.IMG}]');"/> <!-- IF items.S_ID --> <input type="hidden" name="id[{items.IMG}]" value="{items.ID}" /> --- 112,116 ---- <td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td> <td> ! <input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, 'order[{items.A_IMG}]');"/> <!-- IF items.S_ID --> <input type="hidden" name="id[{items.IMG}]" value="{items.ID}" /> Index: acp_permission_roles.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_permission_roles.html,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** acp_permission_roles.html 26 Jul 2007 15:49:43 -0000 1.25 --- acp_permission_roles.html 22 Sep 2007 18:28:19 -0000 1.26 *************** *** 6,10 **** <script type="text/javascript"> ! <!-- var active_pmask = '0'; var active_fmask = '0'; --- 6,10 ---- <script type="text/javascript"> ! // <![CDATA[ var active_pmask = '0'; var active_fmask = '0'; *************** *** 18,22 **** {S_ROLE_JS_ARRAY} <!-- ENDIF --> ! //--> </script> --- 18,22 ---- {S_ROLE_JS_ARRAY} <!-- ENDIF --> ! // ]]> </script> Index: overall_header.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/overall_header.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** overall_header.html 15 Jul 2007 13:43:43 -0000 1.23 --- overall_header.html 22 Sep 2007 18:28:19 -0000 1.24 *************** *** 13,21 **** <script type="text/javascript"> ! <!-- var jump_page = '{LA_JUMP_PAGE}:'; var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; ! var base_url = '{BASE_URL}'; var menu_state = 'shown'; --- 13,21 ---- <script type="text/javascript"> ! // <![CDATA[ var jump_page = '{LA_JUMP_PAGE}:'; var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; ! var base_url = '{A_BASE_URL}'; var menu_state = 'shown'; *************** *** 83,113 **** /** - * Open trace popup - */ - function trace(link) - { - window.open(link.replace(/&/g, '&'), '_trace', 'height=515, resizable=yes, scrollbars=yes, width=750'); - return false; - } - - /** * Find a member */ ! function find_username() { ! <!-- IF UA_FIND_USERNAME --> ! window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760'); ! <!-- 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; } --- 83,105 ---- /** * Find a member */ ! function find_username(url) { ! popup(url, 760, 570, '_usersearch'); return false; } /** ! * Window popup */ ! function popup(url, width, height, name) { ! if (!name) ! { ! name = '_popup'; ! } ! ! window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); return false; } *************** *** 163,167 **** } ! //--> </script> </head> --- 155,159 ---- } ! // ]]> </script> </head> Index: install_update.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/install_update.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** install_update.html 12 Jul 2007 13:01:48 -0000 1.18 --- install_update.html 22 Sep 2007 18:28:19 -0000 1.19 *************** *** 2,12 **** <script type="text/javascript"> ! <!-- function diff_popup(url) { ! window.open(url.replace(/&/g, '&'), 'diff', 'height=600,resizable=yes,scrollbars=yes,width=950'); return false; } ! //--> </script> --- 2,12 ---- <script type="text/javascript"> ! // <![CDATA[ function diff_popup(url) { ! popup(url, 950, 600, '_diff'); return false; } ! // ]]> </script> *************** *** 202,206 **** <!-- ENDIF --> </dt> ! <dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' --> <!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup('{files.U_SHOW_DIFF}'); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd> <!-- IF files.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> --- 202,206 ---- <!-- ENDIF --> </dt> ! <dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' --> <!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd> <!-- IF files.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> *************** *** 211,223 **** <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup('{files.U_SHOW_DIFF}'); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_NEW}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_MOD}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <!-- IF not files.S_LAST_ROW --> --- 211,223 ---- <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <!-- IF not files.S_LAST_ROW --> *************** *** 234,251 **** <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_NEW}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup('{files.U_VIEW_NO_MERGE_MOD}'); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <!-- IF not files.S_BINARY --> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> ! <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup('{files.U_VIEW_NEW_FILE}'); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt> ! <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup('{files.U_VIEW_MOD_FILE}'); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> </dl> <!-- ENDIF --> --- 234,251 ---- <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> ! <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> <!-- IF not files.S_BINARY --> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> ! <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> </dl> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt> ! <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> </dl> <!-- ENDIF --> Index: acp_email.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_email.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** acp_email.html 6 May 2007 15:30:14 -0000 1.8 --- acp_email.html 22 Sep 2007 18:28:19 -0000 1.9 *************** *** 25,29 **** <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="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> <dl> --- 25,29 ---- <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="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> <dl> Index: acp_users_signature.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_users_signature.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** acp_users_signature.html 31 Aug 2007 14:30:10 -0000 1.7 --- acp_users_signature.html 22 Sep 2007 18:28:19 -0000 1.8 *************** *** 1,4 **** ! <script type="text/javascript"> ! <!-- var form_name = 'user_signature'; --- 1,4 ---- ! <script type="text/javascript"> ! // <![CDATA[ var form_name = 'user_signature'; *************** *** 32,40 **** } ! //--> ! </script> ! <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script> ! <form id="user_signature" method="post" action="{U_ACTION}"> <!-- IF SIGNATURE_PREVIEW --> --- 32,40 ---- } ! // ]]> ! </script> ! <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script> ! <form id="user_signature" method="post" action="{U_ACTION}"> <!-- IF SIGNATURE_PREVIEW --> *************** *** 87,93 **** <dl> ! <dt style="width: 90px;"><script type="text/javascript"><!-- ! colorPalette('v', 12, 10); ! //--></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> --- 87,96 ---- <dl> ! <dt style="width: 90px;"> ! <script type="text/javascript"> ! // <![CDATA[ ! colorPalette('v', 12, 10); ! // ]]> ! </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> *************** *** 112,114 **** </fieldset> ! </form> \ No newline at end of file --- 115,117 ---- </fieldset> ! </form> \ No newline at end of file Index: permission_mask.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/permission_mask.html,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** permission_mask.html 24 Jul 2007 15:18:23 -0000 1.31 --- permission_mask.html 22 Sep 2007 18:28:19 -0000 1.32 *************** *** 1,5 **** <script type="text/javascript"> ! <!-- var active_pmask = '0'; var active_fmask = '0'; --- 1,5 ---- <script type="text/javascript"> ! // <![CDATA[ var active_pmask = '0'; var active_fmask = '0'; *************** *** 13,17 **** {S_ROLE_JS_ARRAY} <!-- ENDIF --> ! //--> </script> <script type="text/javascript" src="style/permissions.js"></script> --- 13,17 ---- {S_ROLE_JS_ARRAY} <!-- ENDIF --> ! // ]]> </script> <script type="text/javascript" src="style/permissions.js"></script> *************** *** 103,107 **** <!-- BEGIN mask --> <!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF --> ! <th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th> <!-- IF p_mask.S_VIEW --> <td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->> </td> --- 103,107 ---- <!-- BEGIN mask --> <!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF --> ! <th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th> <!-- IF p_mask.S_VIEW --> <td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->> </td> Index: install_update_diff.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/install_update_diff.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** install_update_diff.html 26 Jul 2007 15:49:44 -0000 1.10 --- install_update_diff.html 22 Sep 2007 18:28:19 -0000 1.11 *************** *** 13,17 **** <script type="text/javascript"> ! <!-- function resize_panel() { --- 13,17 ---- <script type="text/javascript"> ! // <![CDATA[ function resize_panel() { *************** *** 29,33 **** } } ! --> </script> --- 29,33 ---- } } ! // ]]> </script> Index: acp_styles.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_styles.html,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** acp_styles.html 18 Sep 2007 14:47:38 -0000 1.36 --- acp_styles.html 22 Sep 2007 18:28:19 -0000 1.37 *************** *** 52,64 **** <script type="text/javascript" defer="defer"> ! <!-- function update_image(newimage) { ! document.getElementById('newimg').src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png"; } ! //--> </script> <script type="text/javascript"> ! <!-- /** * Handle displaying/hiding the dimension fields --- 52,64 ---- <script type="text/javascript" defer="defer"> ! // <![CDATA[ function update_image(newimage) { ! document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png'; } ! // ]]> </script> <script type="text/javascript"> ! // <![CDATA[ /** * Handle displaying/hiding the dimension fields *************** *** 86,90 **** <!-- ENDIF --> } ! //--> </script> --- 86,90 ---- <!-- ENDIF --> } ! // ]]> </script> *************** *** 154,184 **** <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME --> - <script type="text/javascript" defer="defer"> - <!-- - function append_text_rows(form_name, value) - { - url = document.getElementById(form_name).action; - var_start = url.indexOf('&text_rows='); - if (var_start == -1) - { - document.getElementById(form_name).action = url + "&text_rows=" + value; - } - else - { - url_start = url.substring(0, var_start + 1); - var_end = url.substring(var_start + 1).indexOf('&'); - if (var_end == -1) - { - document.getElementById(form_name).action = url_start + "text_rows=" + value; - } - else - { - document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; - } - } - } - //--> - </script> - <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> --- 154,157 ---- *************** *** 205,212 **** <!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) --> <script type="text/javascript" defer="defer"> ! <!-- function change_editor_height(height) { editor = document.getElementById('template_data'); editor.rows = Math.max(5, Math.min(height, 999)); --- 178,192 ---- <!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) --> <script type="text/javascript" defer="defer"> ! // <![CDATA[ function change_editor_height(height) { + height = Number(height); + + if (isNaN(height)) + { + return; + } + editor = document.getElementById('template_data'); editor.rows = Math.max(5, Math.min(height, 999)); *************** *** 218,222 **** --- 198,213 ---- function append_text_rows(form_name, value) { + value = Number(value); + + if (isNaN(value)) + { + return; + } + url = document.getElementById(form_name).action; + + // Make sure & is actually... & + url = url.replace(/&/g, '&'); + var_start = url.indexOf('&text_rows='); if (var_start == -1) *************** *** 239,243 **** } ! //--> </script> --- 230,234 ---- } ! // ]]> </script> *************** *** 270,285 **** <!-- ELSEIF S_CACHE --> - <script type="text/javascript"> - <!-- - - function viewsource(url) - { - window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750'); - return false; - } - - //--> - </script> - <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> --- 261,264 ---- *************** *** 305,309 **** <!-- BEGIN file --> <!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> ! <td><a href="{file.U_VIEWSOURCE}" onclick="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</a></td> <td>{file.FILESIZE}</td> <td>{file.CACHED}</td> --- 284,288 ---- <!-- BEGIN file --> <!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> ! <td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME}</a></td> <td>{file.FILESIZE}</td> <td>{file.CACHED}</td> Index: acp_groups.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_groups.html,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** acp_groups.html 26 Jul 2007 15:49:43 -0000 1.28 --- acp_groups.html 22 Sep 2007 18:28:19 -0000 1.29 *************** *** 77,81 **** <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="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> --- 77,81 ---- <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> </dl> <dl> *************** *** 255,259 **** <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="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> --- 255,259 ---- <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="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> Index: acp_search.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_search.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** acp_search.html 6 May 2007 15:30:14 -0000 1.18 --- acp_search.html 22 Sep 2007 18:28:19 -0000 1.19 *************** *** 67,72 **** <script type="text/javascript"> ! <!-- ! /** * Popup search progress bar --- 67,71 ---- <script type="text/javascript"> ! // <![CDATA[ /** * Popup search progress bar *************** *** 75,81 **** { close_waitscreen = 0; ! window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400'); } ! //--> </script> --- 74,81 ---- { close_waitscreen = 0; ! // no scrollbars ! popup('{UA_PROGRESS_BAR}&type=' + progress_type, 400, 240, '_index'); } ! // ]]> </script> Index: acp_users.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_users.html,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** acp_users.html 26 Jul 2007 15:49:44 -0000 1.45 --- acp_users.html 22 Sep 2007 18:28:19 -0000 1.46 *************** *** 16,20 **** <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username" /></dd> ! <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> --- 16,20 ---- <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username" /></dd> ! <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> Index: acp_ban.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_ban.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** acp_ban.html 1 Aug 2007 16:24:34 -0000 1.17 --- acp_ban.html 22 Sep 2007 18:28:19 -0000 1.18 *************** *** 10,19 **** <script type="text/javascript"> ! <!-- var ban_length = new Array(); ban_length[-1] = ''; <!-- BEGIN ban_length --> ! ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; <!-- END ban_length --> --- 10,19 ---- <script type="text/javascript"> ! // <![CDATA[ var ban_length = new Array(); ban_length[-1] = ''; <!-- BEGIN ban_length --> ! ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}'; <!-- END ban_length --> *************** *** 21,25 **** ban_reason[-1] = ''; <!-- BEGIN ban_reason --> ! ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; <!-- END ban_reason --> --- 21,25 ---- ban_reason[-1] = ''; <!-- BEGIN ban_reason --> ! ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}'; <!-- END ban_reason --> *************** *** 27,31 **** ban_give_reason[-1] = ''; <!-- BEGIN ban_give_reason --> ! ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; <!-- END ban_give_reason --> --- 27,31 ---- ban_give_reason[-1] = ''; <!-- BEGIN ban_give_reason --> ! ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}'; <!-- END ban_give_reason --> *************** *** 37,41 **** } ! //--> </script> --- 37,41 ---- } ! // ]]> </script> *************** *** 47,51 **** <dt><label for="ban">{L_BAN_CELL}:</label></dt> <dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd> ! <!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF --> </dl> <dl> --- 47,51 ---- <dt><label for="ban">{L_BAN_CELL}:</label></dt> <dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd> ! <!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF --> </dl> <dl> Index: colour_swatch.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/colour_swatch.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** colour_swatch.html 24 Mar 2007 15:59:20 -0000 1.4 --- colour_swatch.html 22 Sep 2007 18:28:19 -0000 1.5 *************** *** 37,41 **** <script type="text/javascript"> ! <!-- var r = 0, g = 0, b = 0; --- 37,41 ---- <script type="text/javascript"> ! // <![CDATA[ var r = 0, g = 0, b = 0; *************** *** 72,76 **** opener.document.forms["{OPENER}"].{NAME}.value = color; } ! //--> </script> --- 72,76 ---- opener.document.forms["{OPENER}"].{NAME}.value = color; } ! // ]]> </script> Index: acp_database.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_database.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** acp_database.html 4 May 2007 23:36:26 -0000 1.12 --- acp_database.html 22 Sep 2007 18:28:19 -0000 1.13 *************** *** 34,38 **** <script type="text/javascript"> ! <!-- function selector(bool) --- 34,38 ---- <script type="text/javascript"> ! // <![CDATA[ function selector(bool) *************** *** 46,50 **** } ! //--> </script> --- 46,50 ---- } ! // ]]> </script> Index: acp_users_overview.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_users_overview.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** acp_users_overview.html 20 Sep 2007 15:35:02 -0000 1.10 --- acp_users_overview.html 22 Sep 2007 18:28:19 -0000 1.11 *************** *** 22,26 **** <dt><label>{L_REGISTERED_IP}:</label></dt> <dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd> ! <dd>[ <a href="{U_WHOIS}" onclick="window.open(this.href, '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd> </dl> <!-- ENDIF --> --- 22,26 ---- <dt><label>{L_REGISTERED_IP}:</label></dt> <dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd> ! <dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd> </dl> <!-- ENDIF --> *************** *** 71,75 **** <script type="text/javascript"> ! <!-- function display_reason(option) --- 71,75 ---- <script type="text/javascript"> ! // <![CDATA[ function display_reason(option) *************** *** 104,108 **** } ! //--> </script> --- 104,108 ---- } ! // ]]> </script> Index: acp_prune_users.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_prune_users.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** acp_prune_users.html 6 May 2007 15:30:14 -0000 1.6 --- acp_prune_users.html 22 Sep 2007 18:28:19 -0000 1.7 *************** *** 34,38 **** <dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> <dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd> ! <dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> <dl> --- 34,38 ---- <dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> <dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd> ! <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> <dl> Index: simple_header.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/simple_header.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** simple_header.html 19 May 2007 12:02:01 -0000 1.13 --- simple_header.html 22 Sep 2007 18:28:19 -0000 1.14 *************** *** 13,21 **** <script type="text/javascript"> ! <!-- var jump_page = '{LA_JUMP_PAGE}:'; var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; ! var base_url = '{BASE_URL}'; /** --- 13,35 ---- <script type="text/javascript"> ! // <![CDATA[ var jump_page = '{LA_JUMP_PAGE}:'; var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; ! var base_url = '{A_BASE_URL}'; ! ! /** ! * Window popup ! */ ! function popup(url, width, height, name) ! { ! if (!name) ! { ! name = '_popup'; ! } ! ! window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); ! return false; ! } /** *************** *** 77,100 **** * Find a member */ ! function find_username() ! { ! <!-- IF UA_FIND_USERNAME --> ! window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760'); ! <!-- 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> </head> --- 91,101 ---- * Find a member */ ! function find_username(url) { ! popup(url, 760, 570, '_usersearch'); return false; } ! // ]]> </script> </head> Index: acp_ranks.html =================================================================== RCS file: /cvsroot/phpbb/phpBB2/adm/style/acp_ranks.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** acp_ranks.html 26 Jul 2007 15:49:44 -0000 1.10 --- acp_ranks.html 22 Sep 2007 18:28:19 -0000 1.11 *************** *** 8,18 **** <script type="text/javascript"> ! <!-- function update_image(newimage) { ! document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif"; } ! //--> </script> --- 8,18 ---- <script type="text/javascript"> ! // <![CDATA[ function update_image(newimage) { ! document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif"; } ! // ]]> </script> |
