[Fusionforge-commits] FusionForge branch master updated. fb50994516f9b73007910db770cf1fd812316b28

Franck VILLAUME nerville at fusionforge.org
Mon Feb 17 18:50:28 CET 2014


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, master has been updated
       via  fb50994516f9b73007910db770cf1fd812316b28 (commit)
      from  a3c080df78b6438469418398b2a505b3097920a0 (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 -----------------------------------------------------------------
commit fb50994516f9b73007910db770cf1fd812316b28
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Feb 17 18:49:40 2014 +0100

    html helper: enhance html_abs_image and use it in getPoweredBy

diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php
index 01d075e..dce99d7 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -618,9 +618,7 @@ class Navigation extends Error {
 	function getPoweredBy($asHTML=true) {
 		$res['url'] = 'http://fusionforge.org/';
 		$res['image'] = util_make_uri('/images/pow-fusionforge.png');
-		$res['title'] = '<img src="'
-			. $res['image']
-			. '" alt="Powered By FusionForge" />';
+		$res['title'] = html_abs_image($res['image'], null, null, array("alt" => "Powered By FusionForge"));
 		$res['html'] = util_make_link($res['url'], $res['title'], array(), true);
 		if ($asHTML) {
 			return $res['html'];
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 304d56c..35c8049 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -120,7 +120,7 @@ function html_feedback_bottom($feedback) {
  * @return	string
  */
 function html_blankimage($height, $width) {
-	return '<img src="/images/blank.png" width="'.$width.'" height="'.$height.'" alt="" />';
+	html_abs_image("/images/blank.png", $width, $height);
 }
 
 /**
@@ -133,8 +133,12 @@ function html_blankimage($height, $width) {
  * @return	string
  */
 function html_abs_image($url, $width, $height, $args) {
+	global $use_tooltips;
 	$return = ('<img src="'.$url.'"');
 	reset($args);
+	if (!$use_tooltips && isset($args['title']) && isset($args['class']) && preg_match('/tabtitle/', $args['class'])) {
+		$args['title'] = '';
+	}
 	while (list($k, $v) = each($args)) {
 		$return .= ' '.$k.'="'.$v.'"';
 	}

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/Navigation.class.php |    4 +---
 src/www/include/html.php                |    6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list