Commit 0cf24b1a4480d7f90d42adf2f04f77fe18e40e14
Merge branch 'exportimagebackgroundissue' into Develop
Showing
2 changed files
with
9 additions
and
8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -3397,14 +3397,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -3397,14 +3397,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 3397 | }; | 3397 | }; |
| 3398 | 3398 | ||
| 3399 | $rootScope.ShowExportImageWindow = function () { | 3399 | $rootScope.ShowExportImageWindow = function () { |
| 3400 | - $(".export-image").css("display", "block"); | ||
| 3401 | - }; | 3400 | + $(".export-image").modal("show").draggable({ handle: ".modal-header" }); |
| 3402 | 3401 | ||
| 3403 | - $rootScope.CloseExportImageWindow = function () { | ||
| 3404 | - console.log('close') | ||
| 3405 | - $(".export-image").css("display", "none"); | 3402 | + $(".modal-backdrop").css("opacity", ".5"); |
| 3403 | + $(".modal-backdrop").css("z-index", "1200001"); | ||
| 3406 | }; | 3404 | }; |
| 3407 | 3405 | ||
| 3406 | + | ||
| 3407 | + | ||
| 3408 | $rootScope.ShowPrintWindow = function () { // Print Active Viewer | 3408 | $rootScope.ShowPrintWindow = function () { // Print Active Viewer |
| 3409 | html2canvas($("#canvasDiv"), { | 3409 | html2canvas($("#canvasDiv"), { |
| 3410 | onrendered: function (canvas) { | 3410 | onrendered: function (canvas) { |
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -1022,11 +1022,12 @@ | @@ -1022,11 +1022,12 @@ | ||
| 1022 | </div> | 1022 | </div> |
| 1023 | 1023 | ||
| 1024 | <!--Export Image Modal--> | 1024 | <!--Export Image Modal--> |
| 1025 | - <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="display: none;"> | 1025 | + <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" |
| 1026 | + style="z-index: 1200002;"> | ||
| 1026 | <div class="modal-dialog modal-sm" role="document"> | 1027 | <div class="modal-dialog modal-sm" role="document"> |
| 1027 | <div class="modal-content"> | 1028 | <div class="modal-content"> |
| 1028 | <div class="modal-header annotation-modal-header ui-draggable-handle"> | 1029 | <div class="modal-header annotation-modal-header ui-draggable-handle"> |
| 1029 | - <button type="button" class="close" data-dismiss="modal" ng-click="CloseExportImageWindow()" aria-label="Close"><span aria-hidden="true">×</span></button> | 1030 | + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> |
| 1030 | <h4 class="modal-title" id="">Save As</h4> | 1031 | <h4 class="modal-title" id="">Save As</h4> |
| 1031 | </div> | 1032 | </div> |
| 1032 | <div class="modal-body"> | 1033 | <div class="modal-body"> |
| @@ -1047,7 +1048,7 @@ | @@ -1047,7 +1048,7 @@ | ||
| 1047 | <div class="row"> | 1048 | <div class="row"> |
| 1048 | <input type="file" id="file1" style="display:none"> | 1049 | <input type="file" id="file1" style="display:none"> |
| 1049 | <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a--> | 1050 | <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a--> |
| 1050 | - <div class="col-sm-12"><button id="btnSaveEI" class="btn btn-primary" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"--> | 1051 | + <div class="col-sm-12"><button id="btnSaveEI" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"--> |
| 1051 | </div> | 1052 | </div> |
| 1052 | </div> | 1053 | </div> |
| 1053 | 1054 |