From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 17 Jul 2015 15:42:45 +0000 (+0000)
Subject: Improve tooltip links
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2f7f642b422ac4b67a97f68d780b27c56360ec31;p=cubeextranet.git

Improve tooltip links
Permit to use bold markup
---

diff --git a/fluidbook/fonts/BFluidbook.otf b/fluidbook/fonts/BFluidbook.otf
new file mode 100644
index 000000000..7c8395364
Binary files /dev/null and b/fluidbook/fonts/BFluidbook.otf differ
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index af7c9ff70..08a3756b2 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1393,8 +1393,14 @@ class wsDAOBook extends commonDAO {
 		// Fonts
 		if ($theme->parametres->fontKit == 'auto') {
 			if ($lang->font != 'system') {
-				$flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);
-				$flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
+				$font = FONT_PATH . '/' . $lang->font;
+				$bfont = FONT_PATH . '/B' . $lang->font;
+				if (!file_exists($bfont)) {
+					$bfont = $font;
+				}
+
+				$flex->addFont($bfont, 'BoldFont', $lang->charset);
+				$flex->addFont($font, 'GeneralFont', $lang->charset);
 			}
 			$flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
 			$flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 5abda243f..e959863a4 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -311,6 +311,7 @@ class tooltipLink extends normalLink {
 	public function getAdditionnalContent() {
 		$res = parent::getAdditionnalContent();
 		$res .= ' data-tooltip-maxwidth="' . $this->compiler->book->parametres->linkTooltipMaxWidth . '" ';
+		$res .= ' data-tooltip-touch="1" ';
 		return $res;
 	}