Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
7d41b2d7
Commit
7d41b2d7
authored
Jul 27, 2009
by
Dries
Browse files
- Patch
#519782
by tic2000: change to become a hidden region like page_top.
parent
9381abb7
Changes
6
Hide whitespace changes
Inline
Side-by-side
includes/common.inc
View file @
7d41b2d7
...
...
@@ -4150,9 +4150,6 @@ function drupal_common_theme() {
'more_link'
=>
array
(
'arguments'
=>
array
(
'url'
=>
NULL
,
'title'
=>
NULL
)
),
'closure'
=>
array
(
'arguments'
=>
array
(
'main'
=>
0
),
),
'blocks'
=>
array
(
'arguments'
=>
array
(
'region'
=>
NULL
),
),
...
...
includes/theme.inc
View file @
7d41b2d7
...
...
@@ -1702,20 +1702,6 @@ function theme_more_link($url, $title) {
return
'<div class="more-link">'
.
t
(
'<a href="@link" title="@title">more</a>'
,
array
(
'@link'
=>
check_url
(
$url
),
'@title'
=>
$title
))
.
'</div>'
;
}
/**
* Execute hook_footer() which is run at the end of the page right before the
* close of the body tag.
*
* @param $main (optional)
* Whether the current page is the front page of the site.
* @return
* A string containing the results of the hook_footer() calls.
*/
function
theme_closure
(
$main
=
0
)
{
$footer
=
module_invoke_all
(
'footer'
,
$main
);
return
implode
(
"
\n
"
,
$footer
)
.
drupal_get_js
(
'footer'
);
}
/**
* Format a username.
*
...
...
@@ -1950,8 +1936,6 @@ function template_preprocess_page(&$variables) {
// using an associated GRDDL profile.
$variables
[
'rdf_namespaces'
]
=
drupal_get_rdf_namespaces
();
$variables
[
'grddl_profile'
]
=
'http://ns.inria.fr/grddl/rdfa/'
;
// Closure should be filled last.
$variables
[
'closure'
]
=
theme
(
'closure'
);
if
(
$node
=
menu_get_object
())
{
$variables
[
'node'
]
=
$node
;
...
...
@@ -2009,6 +1993,8 @@ function template_process_page(&$variables) {
foreach
(
system_region_list
(
$GLOBALS
[
'theme'
])
as
$region_key
=>
$region_name
)
{
$variables
[
$region_key
]
=
drupal_render
(
$variables
[
'page'
][
$region_key
]);
}
// Append javascript to $page_bottom
$variables
[
'page_bottom'
]
.
=
drupal_get_js
(
'footer'
);
$variables
[
'head'
]
=
drupal_get_html_head
();
$variables
[
'css'
]
=
drupal_add_css
();
...
...
modules/system/page.tpl.php
View file @
7d41b2d7
...
...
@@ -197,7 +197,7 @@
</div></div>
<!-- /#page, /#page-wrapper -->
<?php
print
$
closure
;
?>
<?php
print
$
page_bottom
;
?>
</body>
</html>
modules/system/system.api.php
View file @
7d41b2d7
...
...
@@ -160,26 +160,6 @@ function hook_exit($destination = NULL) {
->
execute
();
}
/**
* Insert closing HTML.
*
* This hook enables modules to insert HTML just before the \</body\> closing
* tag of web pages. This is useful for adding JavaScript code to the footer
* and for outputting debug information. It is not possible to add JavaScript
* to the header at this point, and developers wishing to do so should use
* hook_init() instead.
*
* @param $main
* Whether the current page is the front page of the site.
* @return
* The HTML to be inserted.
*/
function
hook_footer
(
$main
=
0
)
{
if
(
variable_get
(
'dev_query'
,
0
))
{
return
'<div style="clear:both;">'
.
devel_query_table
()
.
'</div>'
;
}
}
/**
* Perform necessary alterations to the JavaScript before it is presented on
* the page.
...
...
modules/system/system.module
View file @
7d41b2d7
...
...
@@ -1345,7 +1345,6 @@ function system_init() {
}
}
/**
* Implement MODULE_preprocess_HOOK().
*/
...
...
@@ -1836,6 +1835,7 @@ function _system_get_theme_data() {
'highlight'
=>
'Highlighted content'
,
'help'
=>
'Help'
,
'page_top'
=>
'Page top'
,
'page_bottom'
=>
'Page bottom'
,
),
'description'
=>
''
,
'features'
=>
array
(
...
...
@@ -2015,6 +2015,7 @@ function system_system_info_alter(&$info, $file) {
// Remove page-top from the blocks UI since it is reserved for modules to
// populate from outside the blocks system.
$info
[
'regions_hidden'
][]
=
'page_top'
;
$info
[
'regions_hidden'
][]
=
'page_bottom'
;
}
/**
...
...
themes/garland/page.tpl.php
View file @
7d41b2d7
...
...
@@ -75,6 +75,6 @@
</div>
<!-- /#container -->
</div>
<!-- /#wrapper -->
<?php
print
$
closure
?>
<?php
print
$
page_bottom
;
?>
</body>
</html>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment