diff options
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 43 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 |
2 files changed, 25 insertions, 21 deletions
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 11ab5faa9c..155917e84f 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -22,13 +22,14 @@ <th>{L_IP}</th> <th>{L_TIME}</th> <th>{L_ACTION}</th> - <th>{L_MARK}</th> + <!-- IF S_CLEARLOGS --> + <th>{L_MARK}</th> + <!-- ENDIF --> </tr> </thead> <tbody> <!-- BEGIN log --> <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td> {log.USERNAME} <!-- IF log.REPORTEE_USERNAME --> @@ -38,32 +39,27 @@ <td style="text-align: center;">{log.IP}</td> <td style="text-align: center;">{log.DATE}</td> <td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td> - <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td> + <!-- IF S_CLEARLOGS --> + <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td> + <!-- ENDIF --> </tr> <!-- END log --> </tbody> </table> -<!-- ELSE --> + <fieldset class="display-options"> + {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + <input class="button2" type="submit" value="{L_GO}" name="sort" /> + {S_FORM_TOKEN} + </fieldset> + <hr /> - <div class="errorbox"> - <p>{L_NO_ENTRIES}</p> +<!-- IF PAGINATION --> + <div class="pagination"> + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> </div> - <!-- ENDIF --> - -<fieldset class="display-options"> - {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - <input class="button2" type="submit" value="{L_GO}" name="sort" /> - {S_FORM_TOKEN} -</fieldset> -<hr /> -<!-- IF PAGINATION --> -<div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> -</div> -<!-- ENDIF --> <!-- IF S_SHOW_FORUMS --> <fieldset class="quick"> {L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> @@ -79,7 +75,14 @@ </fieldset> <!-- ENDIF --> +<!-- ELSE --> + + <div class="errorbox"> + <p>{L_NO_ENTRIES}</p> + </div> + +<!-- ENDIF --> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index acc96098c7..e6b0421bec 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -130,6 +130,7 @@ <li>[Fix] Fixed reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)</li> <li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)</li> <li>[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)</li> + <li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> @@ -983,4 +984,4 @@ </div> </body> -</html>
\ No newline at end of file +</html> |