diff options
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 12 | ||||
| -rwxr-xr-x | phpBB/adm/style/acp_inactive.html | 28 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 40 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users.html | 68 |
4 files changed, 69 insertions, 79 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 753cfd0f63..0ff4afd1ad 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -221,20 +221,16 @@ <!-- END member --> </tbody> </table> - - <div class="pagination" style="float: left;"> - <!-- IF PAGINATION --> + <!-- IF PAGINATION --> + <div class="pagination"> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> </div> + <!-- ENDIF --> <fieldset class="quick"> - <span 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></span><br /> - <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> </fieldset> <h1>{L_ADD_USERS}</h1> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 8c50ec5c41..dc447d00fc 100755 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -10,13 +10,11 @@ <div class="clearfix"></div> +<!-- IF PAGINATION --> <div class="pagination"> - <!-- IF PAGINATION --> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> </div> +<!-- ENDIF --> <table cellspacing="1"> <thead> @@ -48,27 +46,25 @@ </tbody> </table> -<!-- IF .inactive --> - <fieldset class="quick" style="float: left;"> + <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="quick"> - <p><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> <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> </fieldset> -<!-- ENDIF --> -<div class="pagination"> - <!-- IF PAGINATION --> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> -</div> + + </form> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index e5dc04c94a..19696c014a 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -8,20 +8,11 @@ <form id="list" method="post" action="{U_ACTION}"> -<fieldset class="quick" style="float: left;"> - {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> - -<div class="clearfix"></div> - +<!-- IF PAGINATION --> <div class="pagination"> - <!-- IF PAGINATION --> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> </div> +<!-- ENDIF --> <!-- IF .log --> <table cellspacing="1"> @@ -46,7 +37,7 @@ </td> <td style="text-align: center;">{log.IP}</td> <td style="text-align: center;">{log.DATE}</td> - <td>{log.ACTION}<!-- IF log.DATA --><br />{log.DATA}</span><!-- ENDIF --></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> </tr> <!-- END log --> @@ -61,8 +52,19 @@ <!-- 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" /> +</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" style="float: left;"> + <fieldset class="quick"> {L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> <input class="button2" type="submit" value="{L_GO}" /> </fieldset> @@ -70,19 +72,13 @@ <!-- IF S_CLEARLOGS --> <fieldset class="quick"> - <b 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></b><br /> <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> - <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /><br /> + <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> <!-- ENDIF --> -<div class="pagination"> - <!-- IF PAGINATION --> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> -</div> + </form> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index aeaff282e7..0c98b04e6b 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -164,20 +164,9 @@ <form id="list" method="post" action="{U_ACTION}"> - <fieldset class="quick" style="float: left;"> - {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> - - <div class="clearfix"></div> - <!-- IF PAGINATION --> <div class="pagination"> - <!-- IF PAGINATION --> <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> </div> <!-- ENDIF --> @@ -188,7 +177,7 @@ <th>{L_REPORT_BY}</th> <th>{L_IP}</th> <th>{L_TIME}</th> - <th>{L_ACTION}</th> + <th>{L_FEEDBACK}</th> <th>{L_MARK}</th> </tr> </thead> @@ -213,12 +202,23 @@ <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" /> + </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_CLEARLOGS --> <fieldset class="quick"> - <b class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></b><br /> <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> - <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <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 --> @@ -678,20 +678,12 @@ var help_line = { <form id="user_attachments" method="post" action="{U_ACTION}"> - <fieldset class="quick" style="float: left;"> - {L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select> - <input class="button2" type="submit" value="{L_GO}" name="sort" /> - </fieldset> - <div class="pagination" style="float: right;"> - <!-- IF PAGINATION --> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> - <!-- ELSE --> - {S_ON_PAGE} - <!-- ENDIF --> + <!-- IF PAGINATION --> + <div class="pagination"> + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> </div> - - <div class="clearfix"></div> + <!-- ENDIF --> <!-- IF .attach --> <table cellspacing="1"> @@ -701,17 +693,17 @@ var help_line = { <th>{L_POST_TIME}</th> <th>{L_FILESIZE}</th> <th>{L_DOWNLOADS}</th> - <th>{L_DELETE}</th> + <th>{L_MARK}</th> </tr> </thead> <tbody> <!-- BEGIN attach --> <!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><b>{L_PM}: </b><!-- ELSE --><b>{L_TOPIC}: </b><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td> - <td>{attach.POST_TIME}</td> - <td>{attach.SIZE}</td> - <td>{attach.DOWNLOAD_COUNT}</td> - <td><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td> + <td style="text-align: center">{attach.POST_TIME}</td> + <td style="text-align: center">{attach.SIZE}</td> + <td style="text-align: center">{attach.DOWNLOAD_COUNT}</td> + <td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td> </tr> <!-- END attach --> </tbody> @@ -721,10 +713,20 @@ var help_line = { <p>{L_NO_ENTRIES}</p> </div> <!-- ENDIF --> - + <fieldset class="display-options"> + {L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select> + <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="quick"> - <b class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></b><br /> <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> + <p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p> </fieldset> </form> |