--- a/front_idill/src/mosaic/js/notifications.js Thu Sep 20 12:59:30 2012 +0200
+++ b/front_idill/src/mosaic/js/notifications.js Fri Sep 21 13:54:20 2012 +0200
@@ -177,7 +177,7 @@
//Panneau d'aide.
//On crée les flèches au niveau du panneau d'aide.
- var notification_help = "<div id='notify_help'><div id='help_details_upArrow' class='help_details_arrows'></div>" + help_search + "<div id='help_sep'></div>" + help_controls + "<div id='help_details_upArrow' class='help_details_arrows'></div></div>";
+ var notification_help = "<div id='notify_help'><div id='help_details_upArrow' class='help_details_arrows'></div>" + help_search + "<div id='help_sep'></div>" + help_controls + "<div id='help_details_downArrow' class='help_details_arrows'></div></div>";
//On les ajoute à la mosaïque.
$('body').append(notification_help);
@@ -375,9 +375,6 @@
//Dimensions des flèches.
var arrowWidth = 50, arrowHeight = 50;
- //On ajoute les flèches pour accéder aux détails du panneau d'aide.
- var help_details_arrows = "<div id='help_details_upArrow' class='help_details_arrows'></div><div id='help_details_downArrow' class='help_details_arrows'></div>";
-
//Nombre d'éléments présents dans les 2 divs de stockage des détails de l'aide.
var helpDetailsLeftContainerLength = Math.ceil(this.helpDetailsGestures.length / 2), helpDetailsRightContainerLength = Math.floor(this.helpDetailsGestures.length / 2);
@@ -388,14 +385,36 @@
var i = 0;
for(i ; i < helpDetailsLeftContainerLength ; i++)
{
+ //On récupère l'usage pour kinect/souris.
+ var usage;
+ if(this.config.mouseInteractions)
+ {
+ usage = this.helpDetailsGestures[i].usage_MI;
+ }
+ else
+ {
+ usage = this.helpDetailsGestures[i].usage_KI;
+ }
+
help_details_gestures += "<div><table border='0'><tr><td rowspan='4'><img class='helpDetailsImgs' src='" + imgPath + MI + all_gestures_img[i] + ".png' /></td><td><b>" +
this.helpDetailsGesturesMetadata.name + '</b> : ' + this.helpDetailsGestures[i].name + "</td></tr><tr><td><b>" +
- this.helpDetailsGesturesMetadata.usage + '</b> : ' + this.helpDetailsGestures[i].usage + "</td></tr><tr><td><b>" +
+ this.helpDetailsGesturesMetadata.usage + '</b> : ' + usage + "</td></tr><tr><td><b>" +
this.helpDetailsGesturesMetadata.desc + '</b> : ' + this.helpDetailsGestures[i].desc + "</td></tr></table></div>";
}
help_details_gestures += "</div><div id='help_details_right_container' class='help_details_containers'>";
for(i ; i < this.helpDetailsGestures.length ; i++)
{
+ //On récupère l'usage pour kinect/souris.
+ var usage;
+ if(this.config.mouseInteractions)
+ {
+ usage = this.helpDetailsGestures[i].usage_MI;
+ }
+ else
+ {
+ usage = this.helpDetailsGestures[i].usage_KI;
+ }
+
help_details_gestures += "<div><table border='0'><tr><td rowspan='4'><img class='helpDetailsImgs' src='" + imgPath + MI + all_gestures_img[i] + ".png' /></td><td><b>" +
this.helpDetailsGesturesMetadata.name + '</b> : ' + this.helpDetailsGestures[i].name + "</td></tr><tr><td><b>" +
this.helpDetailsGesturesMetadata.usage + '</b> : ' + this.helpDetailsGestures[i].usage + "</td></tr><tr><td><b>" +
@@ -404,7 +423,7 @@
help_details_gestures += "</div>";
- notify_help.append(help_details_arrows + help_details_gestures);
+ notify_help.append(help_details_gestures);
//Hauteur totale de la plus longue colonne.
var helpDetailsMaxContainerHeight = $('#help_details_left_container').height();