diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-18 15:09:19 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-18 15:09:19 +0000 |
| commit | 1042152a55ab2d0764c446949a77f085ab7a77f3 (patch) | |
| tree | 008dc317ce03e80988c8c79f8c6d0cf263a02b32 /phpBB/adm | |
| parent | e3d98fe77b1f2c60ceefa0ddf9091d08815d1f89 (diff) | |
| download | forums-1042152a55ab2d0764c446949a77f085ab7a77f3.tar forums-1042152a55ab2d0764c446949a77f085ab7a77f3.tar.gz forums-1042152a55ab2d0764c446949a77f085ab7a77f3.tar.bz2 forums-1042152a55ab2d0764c446949a77f085ab7a77f3.tar.xz forums-1042152a55ab2d0764c446949a77f085ab7a77f3.zip | |
Merge changes made in revisions #r9405 to #r9467
2009-04-18
git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_database.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_email.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_permissions.html | 30 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_search.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 27 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 13 |
6 files changed, 53 insertions, 33 deletions
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index ebc76c36a3..e839fb1bda 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -70,8 +70,8 @@ </dl> <dl> <dt><label for="where">{L_ACTION}:</label></dt> - <dd><label><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD}</label> - <label><input type="radio" class="radio" name="where" value="store" /> {L_STORE_LOCAL}</label> + <dd> + <label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label> <label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd> </dl> <dl> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index b1d9b4af11..885809ffe2 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -44,7 +44,7 @@ </dl> <p class="submit-buttons"> - <input class="button1" type="submit" id="submit" name="submit" value="{L_EMAIL}" /> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index b4386d5f19..63583093b0 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -3,7 +3,7 @@ <a name="maincontent"></a> <!-- IF S_INTRO --> - + <h1>{L_ACP_PERMISSIONS}</h1> {L_ACP_PERMISSIONS_EXPLAIN} @@ -12,10 +12,12 @@ <!-- IF S_SELECT_VICTIM --> + <!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a><!-- ENDIF --> + <h1>{L_TITLE}</h1> <p>{L_EXPLAIN}</p> - + <!-- IF S_FORUM_NAMES --> <p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p> <!-- ENDIF --> @@ -62,7 +64,7 @@ </fieldset> </form> - + <!-- ENDIF --> <!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER --> @@ -123,7 +125,7 @@ <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF --> </dl> </fieldset> - + <fieldset class="quick"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -154,7 +156,7 @@ </div> <div style="float: {S_CONTENT_FLOW_END}; width: 48%"> - + <!-- IF S_CAN_SELECT_GROUP --> <h1>{L_USERGROUPS}</h1> @@ -168,7 +170,7 @@ <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF --> </dl> </fieldset> - + <fieldset class="quick"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -177,7 +179,7 @@ </form> <form id="add_groups" method="post" action="{U_ACTION}"> - + <fieldset> <legend>{L_ADD_GROUPS}</legend> <dl> @@ -199,7 +201,7 @@ <!-- ELSEIF S_SELECT_USERGROUP_VIEW --> <div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> - + <h1>{L_USERS}</h1> <form id="users" method="post" action="{U_ACTION}"> @@ -210,7 +212,7 @@ <dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd> </dl> </fieldset> - + <fieldset class="quick"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -240,7 +242,7 @@ </div> <div style="float: {S_CONTENT_FLOW_END}; width: 48%"> - + <h1>{L_USERGROUPS}</h1> <form id="groups" method="post" action="{U_ACTION}"> @@ -251,7 +253,7 @@ <dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd> </dl> </fieldset> - + <fieldset class="quick"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -311,11 +313,11 @@ <!-- IF S_PERMISSION_DROPDOWN --> <form id="pselect" method="post" action="{U_ACTION}"> - + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> {S_HIDDEN_FIELDS} {S_FORM_TOKEN} - {L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> + {L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> <input class="button2" type="submit" name="submit" value="{L_GO}" /> </fieldset> @@ -347,7 +349,7 @@ </fieldset> <br /><br /> - + </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 0879780749..5fd7a23d97 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -33,6 +33,10 @@ <dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd> </dl> <dl> + <dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt> + <dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd> + </dl> + <dl> <dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> <dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd> </dl> @@ -130,9 +134,9 @@ <!-- END data --> </tbody> </table> - + <!-- ENDIF --> - + <p class="quick"> <!-- IF backend.S_INDEXED --> <input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> @@ -142,7 +146,7 @@ </p> {S_FORM_TOKEN} </fieldset> - + </form> <!-- END backend --> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index adafc0aa6d..93d72d5205 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -28,9 +28,16 @@ function jumpto() { var page = prompt(jump_page, on_page); - if (page !== null && !isNaN(page) && page > 0) + if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { - document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + if (base_url.indexOf('?') == -1) + { + document.location.href = base_url + '?start=' + ((page - 1) * per_page); + } + else + { + document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + } } } @@ -71,7 +78,7 @@ function marklist(id, name, state) } var rb = parent.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++) { if (rb[r].name.substr(0, name.length) == name) @@ -166,7 +173,7 @@ function switch_menu() <p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> • <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p> <p id="skip"><a href="#acp">{L_SKIP}</a></p> </div> - + <div id="page-body"> <div id="tabs"> <ul> @@ -180,31 +187,31 @@ function switch_menu() <div class="panel"> <span class="corners-top"><span></span></span> <div id="content"> - <!-- IF not S_USER_NOTICE --> + <!-- IF not S_USER_NOTICE --> <div id="toggle"> <a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div> <!-- ENDIF --> <div id="menu"> <p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[ <a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a> ]<!-- ENDIF --></p> - <!-- IF S_USER_ADMIN --> + <!-- IF S_USER_ADMIN --> <ul> <!-- 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> <!-- 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> <!-- END l_block3 --> <!-- END l_block2 --> - + <!-- ENDIF --> <!-- END l_block1 --> </ul> <!-- ENDIF --> </div> - + <div id="main"> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 3e36c47988..e7d34c7ff4 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -39,9 +39,16 @@ function jumpto() { var page = prompt(jump_page, on_page); - if (page !== null && !isNaN(page) && page > 0) + if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { - document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + if (base_url.indexOf('?') == -1) + { + document.location.href = base_url + '?start=' + ((page - 1) * per_page); + } + else + { + document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + } } } @@ -77,7 +84,7 @@ function marklist(id, name, state) } var rb = parent.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++) { if (rb[r].name.substr(0, name.length) == name) |
