FSN#25993 SLNKDWF meer FACILITOR look and feel

svn path=/Website/trunk/; revision=17216
2013-03-15 19:24:56 +00:00
parent 69686a6f8e
commit 4c269cc2a7
6 changed files with 126 additions and 202 deletions
--- a/APPL/CAD/default.asp
+++ b/APPL/CAD/default.asp
@@ -23,8 +23,7 @@

 <%
 FCLTHeader.Requires({ js: ["jquery-ui.js", "./main.js", "./draganddrop.js"],
-                      css: ["../slnkdwf/slnkdwf.css"],
-                      lcl: ["PRJ"]
+                      css: ["../slnkdwf/slnkdwf.css"]
                    });

 var inoutMode = getQParamInt("mode", S("fg_startBuiten")? MODE_OUT : MODE_IN);
@@ -256,39 +255,18 @@ if (scenario_key != 0)
      }

      /************************************************************\
-      * Kinda debug info:
-      * Use these two events to see how long took it to generate
-      * image
+      *
      \************************************************************/
-      var startDate = new Date();
      function MMap_onIMGRefresh()
      {
-        var ob = document.getElementById('MinMaxBtn');
-        ob.style.display = 'none'; // Zodat busy.gif zichtbaar
-        startDate = new Date();
-      }
-
-      function MMap_onIMGLoad()
-      {
-<%      if (Session("logging") & 4)
-        { %>
-          var endDate = new Date();
-          navigationCell.title = ("Tijd==>" + (endDate - startDate) + "ms")
-          startDate = new Date();
-<%      } %>
+        $('#MinMaxBtn').hide(); // Zodat busy.gif zichtbaar
      }

      function MMap_onMapperLoad(pSLNKEvent)
      {
-        var ob = document.getElementById('MinMaxBtn');
-        ob.style.display = 'block'; // Zodat weer zichtbaar
-        ob.style.left = ($("#mapCell").offset().left + $("#mapCell").width() - 20) + "px";
-        ob.style.top = ($("#mapCell").offset().top + 4) + "px";
-<%      if (Session("logging") & 4)
-        { %>
-          var endDate = new Date();
-          navigationCell.title += ("/" + (endDate - startDate) + "ms")
-<%      } %>
+        var ob = $('#MinMaxBtn').show(); // Zodat weer zichtbaar
+        ob.css('left', ($("#mapCell").offset().left + $("#mapCell").width() - ob.outerWidth() -2) + "px");
+        ob.css('top', ($("#mapCell").offset().top + 2) + "px");
 <%      if (concept)
        { %>
          MMap2.zoom2DWG((pSLNKEvent.viewminX+pSLNKEvent.viewmaxX) / 2,
@@ -1427,7 +1405,6 @@ if (scenario_key != 0)
          </tr>
        </table>
      </div>
-
      <div id="toggler" onClick="toggleLayout(this)">
      </div>

--- a/APPL/SlnkDwf/Images/printEV.png
+++ b/APPL/SlnkDwf/Images/printEV.png
--- a/APPL/SlnkDwf/SLNKdwf.css
+++ b/APPL/SlnkDwf/SLNKdwf.css
@@ -73,10 +73,10 @@ div#Snapper
  cursor: default;
 }

-img { border: 0px groove black;
-      margin:0;
-      padding:0;
-    }
+#Eview {
+    border: 0px;
+}
+
 hr { border:0; width: 98%; background-color:#ddd;}

 .menuItem { font-family:ms sans serif,helvetica,arial,sans-serif;
@@ -112,3 +112,27 @@ hr { border:0; width: 98%; background-color:#ddd;}
    padding: 5px 5px 5px 0px;
 }

+/* navbuttons */
+#navbuttons {
+    position:absolute;
+    z-index:1;
+    height:28px;
+    background-color: rgba(225,225,225,0.25);
+    margin: 2px;
+    box-shadow: 1px 1px 1px 1px #ddd;
+}
+#navbuttons img {
+    margin: 0;
+    padding: 5px;
+}
+
+.imgup {
+    background-color: #fff;
+    border-right: 1px groove #444;
+    border-bottom: 1px groove #444;
+}
+.imgdown {
+    background-color: transparent;
+    border-left: 1px groove #fff;
+    border-top: 1px groove #fff;
+}
--- a/APPL/SlnkDwf/ToonIMG.asp
+++ b/APPL/SlnkDwf/ToonIMG.asp
@@ -73,6 +73,43 @@ if (typeof(dllMajor) == 'undefined' ||
            }
            alert(version);
        }
+
+       function setPanMode(panmode, pthis)
+       {
+          SetPanMode(panmode);
+         setActive(pthis.id);
+       }
+
+       function setActive(pid)
+       {
+          // reset alle bekende buttons
+          $("#navbuttons img").removeClass("imgdown").addClass("imgup");
+          // en set de ene
+          $("#"+pid).removeClass("imgup").addClass("imgdown");
+       }
+       function isDwfViewerInstalled ()
+       {
+        	var bFound = false;
+            try
+            {
+                var objViewer = new ActiveXObject("AdView.AdViewer");
+                bFound = true;
+            }
+            catch ( e )
+            {
+        		//Failed to create object, viewer not installed
+            }
+            return bFound;
+       }
+
+       function enableEviewPrint()
+       {
+            setActive("ImgArrow");
+            if (isDwfViewerInstalled())
+            {
+                $("#ImgPrintEV").show();
+            }
+       }
    </script>
 </head>
 <%
@@ -82,17 +119,11 @@ if (typeof(dllMajor) == 'undefined' ||
        evtres = ""; // geeft ongewenste resize bij uitzoomen

 %>
-<body id="idBody" name="idBody" onload="Init();Reset();" <%=evtres%>
+<body id="idBody" name="idBody" onload="enableEviewPrint();Init();Reset();" <%=evtres%>
        style="background-color:white;margin:0;padding:0;"
        onmouseleave="_onMouseLeave(event)"
        onselect="document.selection.empty();"
-        onkeydown="return _onKeyDown(event)";>
-    <% if (Request.QueryString("ShowButtons").Count>0) { %>
-        <iframe name="Nav" src=navButtons.asp
-                style="position:absolute;z-index:1;width:276px;height:30px" frameborder="0" scrolling="no"
-                allowtransparency="true" background-color="transparent">
-        </iframe>
-    <% } %>
+        onkeydown="return _onKeyDown(event)">
    <div id="rubberBand" onclick="_stopRubber(event)" onmousemove="_moveRubber(event);"
                onmouseup="_onMouseUp(event);" oncontextmenu="return _oncontextmenu(event);">
    </div>
@@ -102,6 +133,53 @@ if (typeof(dllMajor) == 'undefined' ||
             Hier komt de drag-and-drop HTML
    </div>

+<% if (Request.QueryString("ShowButtons").Count>0) { %>
+    <div id="navbuttons" style="position:absolute;z-index:1;">
+      <img    id="ImgRefresh" src="./images/refresh.png"
+             alt="Refresh Window"
+           title="Refresh Window"
+         onClick= "javascript:Refresh()"
+      >
+      <img    id="ImgArrow" src="./images/arrow.png"
+             alt="Info"
+           title="Info"
+         onClick="javascript:setPanMode(1,this)"
+      >
+<% if (false) {%>
+      <img    id="ImgPan" src="./images/pan.png"
+             alt="Pan"
+           title="Pan"
+         onClick= "javascript:setPanMode(0)"
+      >
+<% } %>
+      <img    id="ImgZoomWin" src="./images/zoomwin.png"
+             alt="Zoom Window"
+           title="Zoom Window"
+         onClick= "javascript:setPanMode(2, this)"
+      >
+      <img    id="ImgZoomOut" src="./images/zoomout.png"
+             alt="Zoom Out"
+           title="Zoom Out"
+         onClick= "javascript:setPanMode(3, this)"
+      >
+      <img    id="ImgZoomExtents" src="./images/zoomextents.png"
+             alt="Zoom Extents"
+           title="Zoom Extents"
+         onClick= "javascript:ZoomExtents(event);"
+      >
+      <img    id="ImgPrint" src="./images/print.png"
+             alt="Print"
+           title="Print"
+         onClick= "javascript:onPrint(event)"
+      >
+      <img    id="ImgPrintEV" src="./images/printEV.png"
+             alt="Print using Autodesk Viewer"
+           title="Print using Autodesk Viewer"
+         onClick= "javascript:onPrintEv(event)"
+         style="display:none;"
+      >
+    </div>
+    <% } %>
    <div id="defaultContextMenu" class="slnkmenu" style="display:none">
        <div class="menuItem" style="margin-top:5px" monClick="Refresh()">Refresh</div>
        <div class="menuItem" monClick="SetPanMode(1)">Select</div>
@@ -134,7 +212,7 @@ if (typeof(dllMajor) == 'undefined' ||

    <img id="busymarker" src="images/busy.gif">
    <img id="Eview" galleryimg="false" usemap="#SystemMap"
-         style="width:100%;height:100%;position:absolute;z-index:0;overflow:hidden;border:0px;"
+         style="width:100%;height:100%;position:absolute;z-index:0;"
     >
    <map id="SystemMap" name="SystemMap"
         onmouseover="_areain(event);"
--- a/APPL/SlnkDwf/ToonIMG.js
+++ b/APPL/SlnkDwf/ToonIMG.js
@@ -1255,25 +1255,16 @@ function Dropper_onMouseUp(evt)

    dd.style.display = 'none';
    dragAndDroppingBusy = false;
-    //_showBusy(evt.clientX-8, evt.clientY-8); // This is where the action is...
    _DoFinder(evt, _ddReason);
    dd.style.display = 'none';
 }

-var _skipOneBusy; // als posX meegegen doe dan bij eerstvolgende _Refresh geen verplaatsing
-                  // posX en posY worden meegegeven na onDrop of na een move
-function _showBusy(posX, posY)
+function _showBusy()
 {
-    if (_skipOneBusy)
-    {
-        _skipOneBusy=false;
-        return;
-    }
-    if (posX) _skipOneBusy = true;
-    var b = document.getElementById("busymarker");
-    b.style.left=(posX?posX:(imgX-18))+"px";
-    b.style.top=(posY?posY:2)+"px";
-    b.style.display="block";
+    var b = $("#busymarker");
+    b.css('left', (imgX - b.outerWidth() - 5) + "px");
+    b.css('top', "2px");
+    b.show();
 }

 function _hideBusy()
@@ -1591,10 +1582,6 @@ function _onLoad(evt)

    elemIMG.style.cursor=(PanMode==1?'pointer':draggingBusy?'move':'auto');

-    // Busymarker gaat nu in ieder geval weer naar rechtsboven
-    var b = document.getElementById("busymarker");
-    b.style.left=imgX-18 + "px";
-    b.style.top="2px";
    // Het plaatje is klaar. Langer kunnen we de mapper niet meer uitstellen
    if (elemIMG.hasMap)
    {
--- a/APPL/SlnkDwf/navbuttons.asp
+++ b/APPL/SlnkDwf/navbuttons.asp
@@ -1,142 +0,0 @@
-<%@ language="javascript" %>
-<% /*  $Revision$
-       $Id$
-
-    File:               NavButtons.asp
-    Description:        Shows navigation buttons for ToonImg.asp
-    Parameters:
-        forFrame        specify the frame where ToonIMG.asp is loaded
-    Context:
-    Note:               Loader can define <????>_OnPrint for the frame where NavButtons is loaded
-
-*/
-    forFrame = Request.QueryString("forFrame").Count>0?"parent."+Request.QueryString("forFrame"):"parent"
-    //bgColor = Request.QueryString("bgColor").Count>0?Request.QueryString("bgColor"):"transparent"
-    //border = Request.QueryString("border").Count>0?Request.QueryString("border"):"1px"
-
-    Response.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"');
-    Response.write(' "http://www.w3.org/TR/html4/strict.dtd">');
-%>
-<HTML>
-  <HEAD>
-    <style type="text/css">
-        geenhekjeaanbeginregel,#navbuttons {
-            background-color: transparent;
-            margin: 1px;
-        }
-        img {
-            margin: 0;
-            padding: 5px;
-        }
-        geenhekjeaanbeginregel,#ImgPrintEV {
-            padding: 0;
-        }
-        .imgup {
-            background-color: #fff;
-            border-right: 1px groove #444;
-            border-bottom: 1px groove #444;
-        }
-        .imgdown {
-            background-color: transparent;
-            border-right: 1px groove #fff;
-            border-bottom: 1px groove #fff;
-        }
-    </style>
-    <script type="text/javascript">
-       function setImage(id, state)
-       {
-          document.getElementById(id).className = (state != "N" ? "imgdown" : "imgup");
-       }
-
-       function setPanMode(panmode, pthis)
-       {
-          <%=forFrame%>.SetPanMode(panmode);
-         setActive(pthis.id);
-       }
-
-       function setActive(pid)
-       {
-          // reset alle bekende buttons
-          setImage("ImgRefresh"    ,"N");
-          setImage("ImgArrow"      ,"N");
-          setImage("ImgZoomWin"    ,"N");
-          setImage("ImgZoomOut"    ,"N");
-          setImage("ImgZoomExtents","N");
-          setImage("ImgPrint"      ,"N");
-          setImage("ImgPrintEV"    ,"N");
-          // en set de ene
-          setImage(pid             ,"D");
-       }
-       function isDwfViewerInstalled ()
-       {
-        	var bFound = false;
-            try
-            {
-                var objViewer = new ActiveXObject("AdView.AdViewer");
-                bFound = true;
-            }
-            catch ( e )
-            {
-        		//Failed to create object, viewer not installed
-            }
-            return bFound;
-       }
-
-       function enableEviewPrint()
-       {
-            setActive("ImgArrow");
-            if (isDwfViewerInstalled())
-            {
-                document.getElementById("ImgPrintEV").style.display="inline";
-            }
-       }
-
-    </script>
-  </HEAD>
-
-  <BODY onload="enableEviewPrint()" id="navbuttons">
-      <img    id="ImgRefresh" src="./images/refresh.png"
-             alt="Refresh Window"
-           title="Refresh Window"
-         onClick= "javascript:<%=forFrame%>.Refresh()"
-      >
-      <img    id="ImgArrow" src="./images/arrow.png"
-             alt="Info"
-           title="Info"
-         onClick="javascript:setPanMode(1,this)"
-      >
-<% if (false) {%>
-      <img    id="ImgPan" src="./images/pan.png"
-             alt="Pan"
-           title="Pan"
-         onClick= "javascript:setPanMode(0)"
-      >
-<% } %>
-      <img    id="ImgZoomWin" src="./images/zoomwin.png"
-             alt="Zoom Window"
-           title="Zoom Window"
-         onClick= "javascript:setPanMode(2, this)"
-      >
-      <img    id="ImgZoomOut" src="./images/zoomout.png"
-             alt="Zoom Out"
-           title="Zoom Out"
-         onClick= "javascript:setPanMode(3, this)"
-      >
-      <img    id="ImgZoomExtents" src="./images/zoomextents.png"
-             alt="Zoom Extents"
-           title="Zoom Extents"
-         onClick= "javascript:<%=forFrame%>.ZoomExtents(event);"
-      >
-      <img    id="ImgPrint" src="./images/print.png"
-             alt="Print"
-           title="Print"
-         onClick= "javascript:<%=forFrame%>.onPrint(event)"
-      >
-      <img    id="ImgPrintEV" src="./images/printEV.png"
-             alt="Print using Autodesk Viewer"
-           title="Print using Autodesk Viewer"
-         onClick= "javascript:<%=forFrame%>.onPrintEv(event)"
-         style="display:none;"
-      >
-  </BODY>
-</HTML>