X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=doc%2Fsalome%2Fgui%2FSMESH%2Fsmesh.htm;h=4964c60ea6d4ff4a23cb3b8ec9580a204affd276;hp=c5c12b4e7a124ba6bc662b49b0aadab422b7f24e;hb=f54ea61edf7a0e6f48091cd0f3b380c195bffc7e;hpb=409b861ea153ec9f8ed69ec02512a9c4d9730329
diff --git a/doc/salome/gui/SMESH/smesh.htm b/doc/salome/gui/SMESH/smesh.htm
index c5c12b4e7..4964c60ea 100755
--- a/doc/salome/gui/SMESH/smesh.htm
+++ b/doc/salome/gui/SMESH/smesh.htm
@@ -9,9 +9,8 @@ if (sPath.indexOf("http")!= -1)
//-->
SMESH reference manual
-
-
+
@@ -34,7 +33,7 @@ var bNoApplet = false;
var strPane = "";
-var nViewFrameType = nWebhelpNavPaneMode;
+var nViewFrameType = -1;
if (!window.gAgent)
{
@@ -43,58 +42,64 @@ if (!window.gAgent)
}
else
{
- if (!gbNav4 && !gbIE4)
+ if (!gbNav4&&!gbIE4&&!gbOpera7&&!gbSafari)
document.location = "whnjs.htm";
- if (gbNav4 && !gbNav6 && ((gnVerMinor <= 4.06)))
+ else if (gbNav4 && !gbNav6 && ((gnVerMinor <= 4.06)))
document.location = "whnjs.htm";
- if (gbMac && gbIE4 && !gbIE5)
+ else if (gbMac && gbIE4 && !gbIE5)
document.location = "whnjs.htm";
//figure out which mode is the best
- if ((nWebhelpNavPaneMode == 1) ||
- (nWebhelpNavPaneMode == 2))
+ else
{
- var gbDHTML = (nWebhelpNavPaneMode == 1);
- if (nWebhelpNavPaneMode == 2) nViewFrameType = 2;
- if (gbNav4) nViewFrameType = 2;
- if (gbNav4 && (gnVerMinor < 4.1)) nViewFrameType = 3;
- if (gbNav4 && (gnVerMinor == 4.6)) nViewFrameType = 3;
- if (gbIE4 && gbDHTML) nViewFrameType = 1;
- if (gbIE4 && gbSunOS && nWebhelpNavPaneMode == 2) nViewFrameType = 3;
- if (gbNav6 && gbDHTML) nViewFrameType = 1;
- if (gbNav6 && !gbNav61 && nWebhelpNavPaneMode == 2) nViewFrameType = 3;
- if (gbMac) nViewFrameType = 3;
- if ((bNoApplet) && (nViewFrameType == 2)) nViewFrameType = 3;
- if (gbOpera) nViewFrameType = 3;
+ nViewFrameType=nWebhelpNavPaneMode;
+ if (nWebhelpNavPaneMode==1||nWebhelpNavPaneMode == 2)
+ {
+ var gbDHTML=(nWebhelpNavPaneMode==1);
+ if (gbNav4) nViewFrameType = 2;
+ if (gbNav4&&(gnVerMinor < 4.1)) nViewFrameType = 3;
+ if (gbNav4&&(gnVerMinor == 4.6)) nViewFrameType = 3;
+ if (gbIE4&&gbDHTML) nViewFrameType = 1;
+ if (gbIE4&&gbSunOS&&nWebhelpNavPaneMode==2) nViewFrameType = 3;
+ if (gbNav4&&gbSunOS&&nViewFrameType==2) nViewFrameType = 3;
+ if (gbNav6&&gbDHTML) nViewFrameType = 1;
+ if (gbNav6&&!gbNav61&&nWebhelpNavPaneMode == 2) nViewFrameType = 3;
+ if (gbMac) nViewFrameType = 3;
+ if (gbOpera7&&nViewFrameType == 2) nViewFrameType = 3;
+ if ((bNoApplet)&&(nViewFrameType == 2)) nViewFrameType = 3;
+ }
}
}
-var gbWindows = ((gAgent.indexOf("win") != -1) || (gAgent.indexOf("16bit") != -1));
-//The colordepth of the 16 color on Windows is 1.
-if ((gbWindows) && (gbNav4) && (window.screen) && (window.screen.colorDepth <= 4))
+if (nViewFrameType!=-1)
{
- alert("WebHelp has detected that your display is set to 16 colors. For full WebHelp support, please set your display to use 256 or more colors.");
- nViewFrameType = 3;
-}
+ var gbWindows = ((gAgent.indexOf("win") != -1) || (gAgent.indexOf("16bit") != -1));
+ //The colordepth of the 16 color on Windows is 1.
+ if ((gbWindows) && (gbNav4) && (window.screen) && (window.screen.colorDepth <= 4))
+ {
+ alert("WebHelp has detected that your display is set to 16 colors. For full WebHelp support, please set your display to use 256 or more colors.");
+ nViewFrameType = 3;
+ }
-//figure out which one is navpane
-// ReplaceMark:nViewFrameType = 1
-if (nViewFrameType == 1)
-{
- if (gbNav4 && !gbNav6)
- strPane = strPaneList;
+ //figure out which one is navpane
+ // ReplaceMark:nViewFrameType = 1
+ if (nViewFrameType == 1)
+ {
+ if (gbNav4 && !gbNav6)
+ strPane = strPaneList;
+ else
+ strPane = strPaneDHTML;
+ }
+ else if (nViewFrameType == 2)
+ strPane = strPaneApplet;
else
- strPane = strPaneDHTML;
+ strPane = strPaneList;
}
-else if (nViewFrameType == 2)
- strPane = strPaneApplet;
-else
- strPane = strPaneList;
//-->