makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
This commit is contained in:
Joas Schilling 2014-05-08 12:29:01 +02:00
commit 6aa3aa3a17
5 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/adm/style/simple_footer.html
View file

@ -21,6 +21,7 @@
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- EVENT acp_simple_footer_after -->
{$SCRIPTS}
</body>
</html>

1
phpBB/adm/style/simple_header.html
View file

@ -83,6 +83,7 @@ function find_username(url)
// ]]>
</script>
<!-- EVENT acp_simple_header_head_append -->
{$STYLESHEETS}
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">

8
phpBB/docs/events.md
View file

@ -617,6 +617,14 @@ simple_header_body_before
* Since: 3.1.0-b2
* Purpose: Add content to the header body
simple_header_head_append
===
* Locations:
+ styles/prosilver/template/simple_header.html
+ styles/subsilver2/template/simple_header.html
* Since: 3.1.0-b4
* Purpose: Add asset calls directly before the `</head>` tag
topiclist_row_prepend
===
* Locations:

4
phpBB/styles/prosilver/template/simple_header.html
View file

@ -24,6 +24,10 @@
<!-- DEFINE $POPUP = 1 -->
<!-- EVENT simple_header_head_append -->
{$STYLESHEETS}
</head>
<body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}">

5
phpBB/styles/subsilver2/template/simple_header.html
View file

@ -9,6 +9,11 @@
<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
<link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" />
<!-- EVENT simple_header_head_append -->
{$STYLESHEETS}
</head>
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">