mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-29 18:50:25 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/7138] Allow simple header and footer for trigger_error() messages Conflicts: phpBB/styles/prosilver/template/message_body.html
This commit is contained in:
commit
d3a1b670bd
@ -1,4 +1,8 @@
|
||||
<!-- INCLUDE overall_header.html -->
|
||||
<!-- IF S_SIMPLE_MESSAGE -->
|
||||
<!-- INCLUDE simple_header.html -->
|
||||
<!-- ELSE -->
|
||||
<!-- INCLUDE overall_header.html -->
|
||||
<!-- ENDIF -->
|
||||
|
||||
<div class="panel" id="message">
|
||||
<div class="inner"><span class="corners-top"><span></span></span>
|
||||
@ -8,4 +12,8 @@
|
||||
<span class="corners-bottom"><span></span></span></div>
|
||||
</div>
|
||||
|
||||
<!-- INCLUDE overall_footer.html -->
|
||||
<!-- IF S_SIMPLE_MESSAGE -->
|
||||
<!-- INCLUDE simple_footer.html -->
|
||||
<!-- ELSE -->
|
||||
<!-- INCLUDE overall_footer.html -->
|
||||
<!-- ENDIF -->
|
||||
|
Loading…
x
Reference in New Issue
Block a user