Commit df546f12b53a4a4411fe033a4d913a52f72fd965
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ModestySettIssue
Showing
11 changed files
with
144 additions
and
53 deletions
150-DOCUMENTATION/AIA-Timelines-V1.12.xlsx
0 → 100644
No preview for this file type
150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 33(30-March-17).xlsx
No preview for this file type
150-DOCUMENTATION/Audit/MatrixCollectionNov-Dec-Jan-AIA.xlsx
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Web.config
... | ... | @@ -40,8 +40,8 @@ |
40 | 40 | <add key="Site_Url" value ="//52.2.38.120"/> |
41 | 41 | <add key ="HostAddress" value="10.100.12.13" /> |
42 | 42 | <add key="isUserAuthenticated" value="false"/> |
43 | - <add key="AdminSupport" value=""/> | |
44 | - </appSettings> | |
43 | + <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> | |
44 | + </appSettings> | |
45 | 45 | <system.web> |
46 | 46 | <compilation debug="true" targetFramework="4.5" /> |
47 | 47 | <httpRuntime targetFramework="4.5" /> | ... | ... |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
... | ... | @@ -39,9 +39,9 @@ |
39 | 39 | <add key="EnableSSL" value="false" /> |
40 | 40 | <add key="Site_Url" value ="//52.2.38.120"/> |
41 | 41 | <add key ="HostAddress" value="10.100.12.13" /> |
42 | - <add key="isUserAuthenticated" value="True"/> | |
43 | - <add key="AdminSupport" value=""/> | |
44 | - </appSettings> | |
42 | + <add key="isUserAuthenticated" value="false"/> | |
43 | + <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> | |
44 | + </appSettings> | |
45 | 45 | <system.web> |
46 | 46 | <compilation debug="true" targetFramework="4.5" /> |
47 | 47 | <httpRuntime targetFramework="4.5" /> | ... | ... |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -921,15 +921,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
921 | 921 | .where('_ViewOrientationId == ' + viewOrientationId) |
922 | 922 | .select(); |
923 | 923 | |
924 | + | |
925 | + | |
926 | + //remove existing body view | |
927 | + var canDiv = document.getElementById('canvasDiv'); | |
928 | + var canDivChildCount = canDiv.childElementCount; | |
929 | + if (canDivChildCount > 0) { | |
930 | + canDiv.innerHTML = ''; | |
931 | + } | |
932 | + | |
924 | 933 | if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) { |
925 | 934 | $scope.ColoredImageSRC = null; |
926 | 935 | $scope.ColoredImageSRC = []; |
927 | - //remove existing body view | |
928 | - var canDiv = document.getElementById('canvasDiv'); | |
929 | - var canDivChildCount = canDiv.childElementCount; | |
930 | - if (canDivChildCount > 0) { | |
931 | - canDiv.innerHTML = ''; | |
932 | - } | |
936 | + | |
933 | 937 | // $scope.flushCanvas(); |
934 | 938 | } |
935 | 939 | else { |
... | ... | @@ -8407,20 +8411,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
8407 | 8411 | } |
8408 | 8412 | |
8409 | 8413 | |
8410 | - $rootScope.mouseMoveToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) { | |
8411 | - | |
8412 | - $("#cursor-block").addClass("custom-tooltip-annotation-toolbar"); | |
8413 | - $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" }); | |
8414 | - $("#cursor-block").html(toolTipText); | |
8415 | - } | |
8416 | - | |
8417 | - $rootScope.mouseOutToolTip = function () { | |
8418 | - | |
8419 | - $(".custom-tooltip-annotation-toolbar").css('display', 'none'); | |
8420 | - $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar"); | |
8421 | - $("#cursor-block").html(); | |
8422 | - | |
8423 | - } | |
8424 | 8414 | |
8425 | 8415 | $scope.OnSearchBtnClick = function (e) { |
8426 | 8416 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -136,6 +136,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
136 | 136 | $rootScope.isVisibleLogin = false; |
137 | 137 | |
138 | 138 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
139 | + $('#dvUserModulesInfo').modal('show'); | |
139 | 140 | |
140 | 141 | var userType = result.userType + ''; |
141 | 142 | |
... | ... | @@ -413,9 +414,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
413 | 414 | |
414 | 415 | $rootScope.$on("$locationChangeSuccess", function () { |
415 | 416 | |
416 | - $rootScope.isLeftMenuActive = function (moduleUrl) { | |
417 | - | |
418 | - return moduleUrl === $location.path(); | |
417 | + $rootScope.HightLightModuleSelection = function (moduleUrl) { | |
418 | + var currentRoute = $location.path().substring(1); | |
419 | + return moduleUrl === currentRoute ? 'active' : ''; | |
419 | 420 | } |
420 | 421 | |
421 | 422 | if (($location.url() == "/da-body-view")) { |
... | ... | @@ -875,6 +876,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
875 | 876 | |
876 | 877 | $rootScope.switchCanvas(); |
877 | 878 | } |
879 | + else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)") | |
880 | + { | |
881 | + // we are switching canvas from paint to draw to prevent paint because it does not take transparent color and we need control default black color for the case where user has unchecked fill option from Edit Shape Style window | |
882 | + | |
883 | + $rootScope.switchCanvas(); | |
884 | + } | |
878 | 885 | else { |
879 | 886 | |
880 | 887 | $rootScope.switchCanvasToPaintCanvas(); |
... | ... | @@ -3488,13 +3495,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
3488 | 3495 | AdminService.SendAdminAccessRequestMail(userInfo) |
3489 | 3496 | .then(function (result) { |
3490 | 3497 | if (result == AdminConstants.MAIL_SENT) { |
3491 | - $("#adminModal").fadeOut(); | |
3492 | - $("#adminModal").modal('hide'); | |
3493 | - $("adminAccessTextArea").text(''); | |
3494 | - | |
3495 | - $rootScope.errorMassage = AdminConstants.MAIL_SENT; | |
3498 | + $rootScope.errorMassage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE; | |
3496 | 3499 | $("#messageModal").modal('show'); |
3497 | 3500 | } |
3501 | + $("#adminModal").fadeOut(); | |
3502 | + $("#adminModal").modal('hide'); | |
3503 | + $('[name="adminAccessTextArea"]').val(''); | |
3498 | 3504 | }, |
3499 | 3505 | function (error) { |
3500 | 3506 | console.log(' Error in sending mail to admin support = ' + error.statusText); |
... | ... | @@ -3508,5 +3514,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
3508 | 3514 | $("#adminModal").modal('hide'); |
3509 | 3515 | $("adminAccessTextArea").text(''); |
3510 | 3516 | } |
3517 | + | |
3518 | + | |
3519 | + $rootScope.addToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) { | |
3520 | + | |
3521 | + $("#cursor-block").addClass("custom-tooltip-annotation-toolbar"); | |
3522 | + $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" }); | |
3523 | + $("#cursor-block").html(toolTipText); | |
3524 | + } | |
3525 | + | |
3526 | + $rootScope.removeToolTipOnMouseOut = function () { | |
3527 | + | |
3528 | + $(".custom-tooltip-annotation-toolbar").css('display', 'none'); | |
3529 | + $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar"); | |
3530 | + $("#cursor-block").html(); | |
3531 | + | |
3532 | + } | |
3511 | 3533 | }] |
3512 | 3534 | ); |
3513 | 3535 | \ No newline at end of file | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
... | ... | @@ -312,7 +312,9 @@ AIA.constant("LoginMessageConstants", { |
312 | 312 | }) |
313 | 313 | AIA.constant("AdminConstants", { |
314 | 314 | "ERROR_IN_SENDING_MAIL": "Some internal error occured.", |
315 | - "MAIL_SENT": "Mail sent." | |
315 | + "MAIL_SENT": "Mail sent.", | |
316 | + "MAIL_NOT_SENT": "Mail not sent.", | |
317 | + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon." | |
316 | 318 | }) |
317 | 319 | AIA.constant("UserTypeConstants", { |
318 | 320 | "SUPER_ADMIN": "Super Admin", | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | <div class="col-sm-12 col-md-12 pageHeading"> |
4 | 4 | <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>--> |
5 | 5 | <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div> |
6 | - <h4 class="pull-left">{{currentActiveModuleTitle}}</h4> | |
6 | + <h4 class="pull-left" data-ng-bind="currentActiveModuleTitle"><!--{{currentActiveModuleTitle}}--></h4> | |
7 | 7 | <div class="pull-right paddTop4 "> |
8 | 8 | <!--<div class="pull-right paddTop4 ">--> |
9 | 9 | <div role="group" ng-show="showme" class="btn-group"> |
... | ... | @@ -26,7 +26,7 @@ |
26 | 26 | <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide "> |
27 | 27 | <!--{{name}}--> |
28 | 28 | <ul class="nav nav-sidebar" ng-init="hideScrollbar()"> |
29 | - <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible()">{{module.name}}</a></li> | |
29 | + <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li> | |
30 | 30 | </ul> |
31 | 31 | </div> |
32 | 32 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
... | ... | @@ -629,24 +629,24 @@ |
629 | 629 | <div class="" aria-label="..."> |
630 | 630 | <div class="" role="group" align="center"> |
631 | 631 | <div id="cursor-block" style="display: none; font-size:13px;"></div> |
632 | - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button> | |
633 | - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button> | |
634 | - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button> | |
635 | - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button> | |
632 | + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="addToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button> | |
633 | + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="addToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button> | |
634 | + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="addToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button> | |
635 | + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="addToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button> | |
636 | 636 | </div> |
637 | 637 | <div class="" role="group" align="center"> |
638 | - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button> | |
639 | - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button> | |
640 | - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button> | |
641 | - <!--<button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>--> | |
638 | + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="addToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button> | |
639 | + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="addToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button> | |
640 | + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="addToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button> | |
641 | + <!--<button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="addToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>--> | |
642 | 642 | </div> |
643 | 643 | </div> |
644 | 644 | </div> |
645 | - <div class="well-popup well blankshapediv" ng-mouseover="mouseMoveToolTip(200, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> | |
645 | + <div class="well-popup well blankshapediv" ng-mouseover="addToolTip(200, 170, 120, 'Edit Style')" ng-mouseleave="removeToolTipOnMouseOut()"> | |
646 | 646 | <!--#7931--> |
647 | 647 | |
648 | 648 | <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> |
649 | - <div id="previewBorder" class="outlinediv" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> | |
649 | + <div id="previewBorder" class="outlinediv" ng-mouseover="addToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="removeToolTipOnMouseOut()"> | |
650 | 650 | <div id="shapeStyleDiv" style="background-color: #ffffff;" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> |
651 | 651 | |
652 | 652 | </div> |
... | ... | @@ -656,23 +656,23 @@ |
656 | 656 | <div class="well well-popup"> |
657 | 657 | <div class="" role="group" aria-label="..."> |
658 | 658 | <div> |
659 | - <a href="#canvasPaint" data-tool="marker" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a> | |
660 | - <a href="#canvasPaint" data-tool="eraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" data-size=" 1" id="annotationpainteraser" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()" role="button"><i class=" fa fa-eraser"></i></a> | |
659 | + <a href="#canvasPaint" data-tool="marker" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="addToolTip(270, 50, 120, 'Paint')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a> | |
660 | + <a href="#canvasPaint" data-tool="eraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" data-size=" 1" id="annotationpainteraser" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()" role="button"><i class=" fa fa-eraser"></i></a> | |
661 | 661 | |
662 | - <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>--> | |
662 | + <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>--> | |
663 | 663 | <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> |
664 | - <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()"> | |
664 | + <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"> | |
665 | 665 | <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)"> |
666 | 666 | </div> |
667 | 667 | <div style="width: 22px; float: left;"> |
668 | 668 | <div style="width: 100%; float: left; height: 16px;"> |
669 | - <button type="button" id="btnBrushSizeIncrement" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> | |
669 | + <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> | |
670 | 670 | |
671 | 671 | <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png"> |
672 | 672 | </button> |
673 | 673 | </div> |
674 | 674 | <div style="width: 100%; float: left; height: 16px;"> |
675 | - <button type="button" id="btnBrushSizeDecrease" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> | |
675 | + <button type="button" id="btnBrushSizeDecrease" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> | |
676 | 676 | <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png"> |
677 | 677 | </button> |
678 | 678 | </div> |
... | ... | @@ -681,7 +681,7 @@ |
681 | 681 | </div> |
682 | 682 | |
683 | 683 | <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> |
684 | - <div id="slider-range-min-2" ng-mouseover="mouseMoveToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()"></div> | |
684 | + <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div> | |
685 | 685 | </div> |
686 | 686 | <div class="clearfix"></div> |
687 | 687 | </div> |
... | ... | @@ -1215,6 +1215,83 @@ |
1215 | 1215 | </div> |
1216 | 1216 | </div> |
1217 | 1217 | |
1218 | + <!--Available modules list modal after login--> | |
1219 | + <div class="modal fade ui-draggable in" id="dvUserModulesInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; left: 0px !important; z-index: 111111;"> | |
1220 | + <div class="modal-dialog" role="document"> | |
1221 | + <div class="modal-content"> | |
1222 | + <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;"> <!--color: #e5e5e5;--> | |
1223 | + <!--bg-primary--> | |
1224 | + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> | |
1225 | + <h5 class="text-left lhgt19 padd5" style="color:#fff; text-align:left;">Below is the list of modules available:</h5> | |
1226 | + </div> | |
1227 | + <div class="modal-body"> | |
1228 | + <div class="panel-body"> | |
1229 | + <!-- form --> | |
1230 | + <form class="form-horizontal"> | |
1231 | + <div class="form-group"> | |
1232 | + <div class="col-sm-8">• Dissectible Anatomy</div> | |
1233 | + </div> | |
1234 | + <div class="form-group"> | |
1235 | + <div class="col-sm-8"><i>• Atlas Anatomy (Not Available) – 06/30/2017</i></div> | |
1236 | + </div> | |
1237 | + <div class="form-group"> | |
1238 | + <div class="col-sm-8">• Clinical Illustration</div> | |
1239 | + </div> | |
1240 | + <div class="form-group"> | |
1241 | + <div class="col-sm-8">• Clinical Animation</div> | |
1242 | + </div> | |
1243 | + <div class="form-group"> | |
1244 | + <div class="col-sm-8">• 3D Anatomy</div> | |
1245 | + </div> | |
1246 | + <div class="form-group"> | |
1247 | + <div class="col-sm-8"><i>• Curriculum Builder (Not Available) – 06/15/2017</i></div> | |
1248 | + </div> | |
1249 | + <div class="form-group"> | |
1250 | + <div class="col-sm-8"><i>• Anatomy Test (Not Available) – 05/28/2017</i></div> | |
1251 | + </div> | |
1252 | + <div class="form-group"> | |
1253 | + <div class="col-sm-8">• IP 10</div> | |
1254 | + </div> | |
1255 | + <div class="form-group"> | |
1256 | + <div class="col-sm-8">• Lab Exercise</div> | |
1257 | + </div> | |
1258 | + <div class="form-group"> | |
1259 | + <div class="col-sm-8">• Encyclopedia</div> | |
1260 | + </div> | |
1261 | + <div class="form-group"> | |
1262 | + <div class="col-sm-8">• In - Depth Reports</div> | |
1263 | + </div> | |
1264 | + <div class="form-group"> | |
1265 | + <div class="col-sm-8">• Complementary and Alternative Medicine</div> | |
1266 | + </div> | |
1267 | + <div class="form-group"> | |
1268 | + <div class="col-sm-8">• Symptom Navigator</div> | |
1269 | + </div> | |
1270 | + <div class="form-group"> | |
1271 | + <div class="col-sm-8">• The Wellness Tool</div> | |
1272 | + </div> | |
1273 | + <div class="form-group"> | |
1274 | + <div class="col-sm-8">• Body Guide</div> | |
1275 | + </div> | |
1276 | + <div class="form-group"> | |
1277 | + <div class="col-sm-8">• A.D.A.M Images</div> | |
1278 | + </div> | |
1279 | + <div class="form-group"> | |
1280 | + <div class="col-sm-8">• A.D.A.M on Demand</div> | |
1281 | + </div> | |
1282 | + <div class="form-group"> | |
1283 | + <div style="text-align: center"> | |
1284 | + <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" data-dismiss="modal"><i class="fa fa-check"></i> OK</button> | |
1285 | + </div> | |
1286 | + </div> | |
1287 | + </form> | |
1288 | + </div> | |
1289 | + </div> | |
1290 | + | |
1291 | + </div> | |
1292 | + </div> | |
1293 | + </div> | |
1294 | + | |
1218 | 1295 | <script> |
1219 | 1296 | |
1220 | 1297 | function enableDisableFillOption() { | ... | ... |