This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, feature/twig-template-engine has been updated
via d139f39da8492d5c62d0eb743c2318a43ab718e8 (commit)
from 08f0501689c59d70224751b19c08f7bc8d460417 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d139f39da8492d5c62d0eb743c2318a43ab718e8
commit d139f39da8492d5c62d0eb743c2318a43ab718e8
Author: Roland Mas <[email protected]>
Date: Wed Jun 17 16:00:29 2015 +0200
Fixed display of message box
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index f98cc48..7c25160 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -158,6 +158,7 @@ class Theme_Funky_Twig extends Theme_Funky {
return $this->renderTemplate('StyleSheets.html', $vars);
}
function header($params) {
+ plugin_hook('htmlhead');
$this->headerHTMLDeclaration();
$vars = array();
@@ -278,8 +279,10 @@ class Theme_Funky_Twig extends Theme_Funky {
}
// Message plugin
- plugin_hook_by_reference('message', $params);
- if (isset ($params['message'])) {
+ $message = '';
+ $params['message'] = &$message;
+ plugin_hook('message', $params);
+ if ($params['message'] != '') {
$vars['message'] = $params['message'];
}
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
index 2f87bf1..1a3b2a4 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -55,7 +55,7 @@
{% if message %}
<div id="message_box">
- <img src="{{ image_url }}/ic/close.png" alt="Close id="message_close"
style="float:right;cursor:pointer" />
+ <img src="{{ image_url }}/ic/close.png" alt="Close" id="message_close"
style="float:right;cursor:pointer" />
{{ message }}
</div>
{% endif %}
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index 81cf806..b06a310 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -76,8 +76,10 @@ class Theme_Funky extends Layout {
echo html_ac(html_ap() -1);
echo html_ao('div', array('id' => 'maindiv'));
- plugin_hook_by_reference('message', $params);
- if (isset ($params['message'])) {
+ $message = '';
+ $params['message'] = &$message;
+ plugin_hook('message', $params);
+ if ($params['message'] != '') {
echo '<div id="message_box">';
echo html_image("ic/close.png", '', '',
array('alt'=>_('Close'), 'id'=>'message_close',
'style'=>'float:right;cursor:pointer'));
echo $params['message'];
-----------------------------------------------------------------------
Summary of changes:
src/www/themes/funky-twig/Theme.class.php | 7 +++++--
src/www/themes/funky-twig/templates/bodyHeader.html | 2 +-
src/www/themes/funky/Theme.class.php | 6 ++++--
3 files changed, 10 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
