Commit ae77d47e41ca41c3adcc8723a23e3129b182f3fc

Authored by Lars Jørgen Fredheim
1 parent f2f07486

Added suffix for PDF

@@ -819,6 +819,48 @@ ul li { @@ -819,6 +819,48 @@ ul li {
819 /************************************************/ 819 /************************************************/
820 /***************** Overlay **********************/ 820 /***************** Overlay **********************/
821 821
  822 +.init-info {
  823 + position: fixed;
  824 + left: 0;
  825 + top: 0;
  826 + z-index: 20;
  827 + width: 100%;
  828 + height: 100%;
  829 + background: rgba(0,0,0, 0.5);
  830 +}
  831 +
  832 +.init-info-box {
  833 + position: fixed;
  834 + background-color: white;
  835 + border: 1px solid black;
  836 + border-radius: 5px;
  837 + width: 300px;
  838 + left: calc(50% - 150px);
  839 + bottom: calc(50% - 65px);
  840 +}
  841 +
  842 +.btn-yes {
  843 + margin-left: 10px;
  844 + margin-right: 5px;
  845 +}
  846 +
  847 +.btn-no {
  848 + margin-right: 10px;
  849 + margin-left: 5px;
  850 +}
  851 +.btn-yes, .btn-no {
  852 + display: inline;
  853 + width: 130px;
  854 + margin-top: 10px;
  855 + margin-bottom: 10px;
  856 + border: 1px solid black;
  857 + background-color: #eeeeee;
  858 +}
  859 +
  860 +.btn-yes:hover, .btn-no:hover {
  861 + transform: scale(1.05);
  862 +}
  863 +
822 .info { 864 .info {
823 position: fixed; 865 position: fixed;
824 z-index: 30; 866 z-index: 30;
images/terrace_diamond_labeled.png

17.4 KB | W: | H:

24.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/terrace_l_shape_labeled.png

12 KB | W: | H:

18.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/terrace_square_labeled.png

8.01 KB | W: | H:

11.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/terrace_triangle_labeled.png

26.7 KB | W: | H:

22.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 </div> 93 </div>
94 </div> 94 </div>
95 95
96 - <!-- REMOVE ------------------------------------------------------------------------------------ 96 + <!-- REMOVE ------------------------------------------------------------------------------------>
97 <div class="row"> 97 <div class="row">
98 <button class="btn btn-info center" id="quickBuild" onclick="Setup.quickBuild()">4 x 4</button> 98 <button class="btn btn-info center" id="quickBuild" onclick="Setup.quickBuild()">4 x 4</button>
99 </div> 99 </div>
@@ -336,8 +336,12 @@ @@ -336,8 +336,12 @@
336 <li> 336 <li>
337 <input class="view" id="view" type="image" src="images/icons/view.png"/> 337 <input class="view" id="view" type="image" src="images/icons/view.png"/>
338 <ul class="dropdown-view"> 338 <ul class="dropdown-view">
339 - <li><input class="cameraButtons" id="camera2DButton" type="image" src="images/cam2D_blk.png" onclick="use2DCamera()" ondragstart="return false;" /></li>  
340 - <li><input class="cameraButtons" id="camera3DButton" type="image" src="images/cam3D_red.png" onclick="use3DCamera()" ondragstart="return false;" /></li> 339 + <li>
  340 + <input class="cameraButtons" id="camera2DButton" type="image" src="images/cam2D_blk.png" onclick="use2DCamera()" ondragstart="return false;" />
  341 + </li>
  342 + <li>
  343 + <input class="cameraButtons" id="camera3DButton" type="image" src="images/cam3D_red.png" onclick="use3DCamera()" ondragstart="return false;" />
  344 + </li>
341 </ul> 345 </ul>
342 </li> 346 </li>
343 </ul> 347 </ul>
@@ -383,8 +387,6 @@ @@ -383,8 +387,6 @@
383 387
384 </div> 388 </div>
385 389
386 - <div class="toolbar-tip hide" id="toolbar-tip">Velg retning</div>  
387 -  
388 <div id="poleMenu"> 390 <div id="poleMenu">
389 <div class="meshControlsButtonsDiv" style="margin-left: 8px;"> 391 <div class="meshControlsButtonsDiv" style="margin-left: 8px;">
390 <input class="meshControlsButtons" type="image" src="images/menu_pole_rotate_left.png" onclick="rotateMeshLeft()" title="Roter mot venstre" ondragstart="return false;" /> 392 <input class="meshControlsButtons" type="image" src="images/menu_pole_rotate_left.png" onclick="rotateMeshLeft()" title="Roter mot venstre" ondragstart="return false;" />
@@ -417,13 +419,6 @@ @@ -417,13 +419,6 @@
417 <option value="2">Sotet glass</option> 419 <option value="2">Sotet glass</option>
418 </select> 420 </select>
419 </div> 421 </div>
420 - <!--<div id="glassMenuType">  
421 - <select class="" title="Glasstype" id="glassMenuTypeSelect" onchange="changeGlassType()">  
422 - <option value="0">Klart</option>  
423 - <option value="1">Frostet</option>  
424 - <option value="2">Sotet</option>  
425 - </select>  
426 - </div>-->  
427 </div> 422 </div>
428 423
429 <div id="autoGenInfo"> 424 <div id="autoGenInfo">
@@ -463,12 +458,22 @@ @@ -463,12 +458,22 @@
463 </div> 458 </div>
464 </div> 459 </div>
465 460
  461 + <div class="init-info hide" id="init-info">
  462 + <div class="init-info-box">
  463 + <div style="margin-top: 10px">Ønsker du en gjennomgang av programmets funksjoner?</div>
  464 + <button class="btn btn-yes" id="btYes" onclick="displayInfo()">Ja</button>
  465 + <button class="btn btn-no" id="btNo" onclick="hidePopup()">Nei</button>
  466 + </div>
  467 + </div>
  468 +
466 <div class="info hide" id="info"> 469 <div class="info hide" id="info">
467 <p class="infotext" id="info1">This is an overlay</p> 470 <p class="infotext" id="info1">This is an overlay</p>
468 <p class="infotext hide" id="info2">This is another overlay</p> 471 <p class="infotext hide" id="info2">This is another overlay</p>
469 <span class="close-info" onclick="closeInfo()">&times;</span> 472 <span class="close-info" onclick="closeInfo()">&times;</span>
470 <input class="btNextTip" id="btNextTip" type="image" src="images/icons/next.png" onclick="nextTip()"/> 473 <input class="btNextTip" id="btNextTip" type="image" src="images/icons/next.png" onclick="nextTip()"/>
471 </div> 474 </div>
  475 +
  476 +
472 </div> 477 </div>
473 478
474 <!-- jQuery --> 479 <!-- jQuery -->
@@ -314,7 +314,9 @@ function onAutoGenFinished() { @@ -314,7 +314,9 @@ function onAutoGenFinished() {
314 } 314 }
315 315
316 function displayInfo() { 316 function displayInfo() {
  317 + document.getElementById("init-info").style.display = "none";
317 document.getElementById("info").style.display = "inline"; 318 document.getElementById("info").style.display = "inline";
  319 + document.getElementById("topButtons").style.zIndex = "31";
318 } 320 }
319 321
320 function closeInfo() { 322 function closeInfo() {
@@ -594,6 +596,14 @@ function useSolution(solution) { @@ -594,6 +596,14 @@ function useSolution(solution) {
594 } 596 }
595 } 597 }
596 598
  599 +function hidePopup() {
  600 + document.getElementById("init-info").style.display = "none";
  601 +}
  602 +
  603 +function initHelpOverlay() {
  604 +
  605 +}
  606 +
597 const MODULE_PRICES = { 607 const MODULE_PRICES = {
598 "wall": 628, 608 "wall": 628,
599 "end" : 1848, 609 "end" : 1848,
@@ -51,7 +51,7 @@ class PDF { @@ -51,7 +51,7 @@ class PDF {
51 this.doc.text(item.nobb.toString() + "", this.col2X, textY); 51 this.doc.text(item.nobb.toString() + "", this.col2X, textY);
52 this.doc.text(item.description.toString() + "", this.col3X, textY); 52 this.doc.text(item.description.toString() + "", this.col3X, textY);
53 this.doc.text(item.amount.toString() + "", this.col4X + 5, textY); 53 this.doc.text(item.amount.toString() + "", this.col4X + 5, textY);
54 - this.doc.text(PDF.NumToStr(price), this.col5X + this.xOffset(price, ",-"), textY); 54 + this.doc.text(PDF.NumToStr(price, ",-"), this.col5X + this.xOffset(price, ",-"), textY);
55 55
56 if (this.page === 1 && pageRow === 22 || pageRow === 26) { 56 if (this.page === 1 && pageRow === 22 || pageRow === 26) {
57 this.addPage(); 57 this.addPage();
@@ -96,6 +96,7 @@ class Setup { @@ -96,6 +96,7 @@ class Setup {
96 initCanvas(); 96 initCanvas();
97 terrace.displayTerrace(inputs); 97 terrace.displayTerrace(inputs);
98 camera.focusPerspectiveCamera(); 98 camera.focusPerspectiveCamera();
  99 + document.getElementById("init-info").style.display = "inline";
99 resize(); 100 resize();
100 } 101 }
101 } 102 }
@@ -108,6 +109,7 @@ class Setup { @@ -108,6 +109,7 @@ class Setup {
108 document.getElementById("setup").style.display = "none"; 109 document.getElementById("setup").style.display = "none";
109 document.getElementById("main").style.display = "inline"; 110 document.getElementById("main").style.display = "inline";
110 canvas.style.display = "inline"; 111 canvas.style.display = "inline";
  112 + document.getElementById("init-info").style.display = "inline";
111 113
112 initCanvas(); 114 initCanvas();
113 terrace.displayTerrace(inputs); 115 terrace.displayTerrace(inputs);