ADAM / AIAHTML5

Commit 0fb9ec8e7ded480e7f97c5e4fd0174802c5f8c6e

Authored by Amrita Vishnoi
1 parent 53f67365

74 merged request changes

Inline Side-by-side
Showing 5 changed files with 89 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @0fb9ec8
... ... @@ -2661,6 +2661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2661 2661  
2662 2662 $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationForTBox) {
2663 2663  
  2664 + //debugger;
2664 2665 if (isAnnotationForTBox == true) {
2665 2666 //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that
2666 2667 // we decide the size of speech bubble
... ... @@ -4976,6 +4977,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4976 4977 $("#btnNormalMode").removeClass("btn-primary");
4977 4978 }
4978 4979  
  4980 + //7900
  4981 + $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
  4982 + $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
  4983 +
  4984 +
4979 4985 }
4980 4986  
4981 4987 $scope.enableNormalMode = function () {
... ... @@ -5018,7 +5024,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5018 5024  
5019 5025 //7.
5020 5026 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
5021   -
  5027 +
  5028 +
5022 5029 $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
5023 5030 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
5024 5031  
... ... @@ -6111,7 +6118,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6111 6118 $rootScope.resetText = 0;
6112 6119 $rootScope.resetTextSave = 0;
6113 6120 $rootScope.ObjectIndexSave = 0;
6114   -
  6121 +
6115 6122 var arrayRect = {};
6116 6123  
6117 6124  
... ... @@ -6171,7 +6178,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6171 6178 rounded: true,
6172 6179 x1: $scope.offsetX1, y1: $scope.offsetY1,
6173 6180 x2: $scope.x, y2: $scope.y,
6174   -
  6181 +
6175 6182 click: function (layer) {
6176 6183 $rootScope.canvasLayerNameCollection = [];
6177 6184 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -6649,7 +6656,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6649 6656 }
6650 6657  
6651 6658  
6652   -
6653 6659 //-- TextArea functionality of Annotation toolbar
6654 6660  
6655 6661 $rootScope.fontSizes;
... ... @@ -7892,6 +7898,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7892 7898 }
7893 7899  
7894 7900 }
  7901 +
  7902 +
  7903 +
  7904 +
  7905 +
7895 7906 }]
7896 7907  
7897 7908 );
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0fb9ec8
... ... @@ -117,6 +117,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
117 117  
118 118 //annotation tool custom events
119 119 $rootScope.ShowAnnotationWindow = function () {
  120 + //7904
  121 + $("#annotationToolBarOptions").addClass("active");
  122 + $("#annotationButton").addClass("active");
  123 +
120 124 $rootScope.isAnnotationWindowOpen = true;
121 125 $(".annotationTollbar").css("display", "block");
122 126 $rootScope.$broadcast('annotationToolEvent', true);
... ... @@ -125,7 +129,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
125 129 }
126 130  
127 131 $rootScope.CloseAnnotationTool = function () {
128   - console.log('close')
  132 + console.log('close');
  133 + //7904
  134 + $("#annotationButton").removeClass("active");
  135 + $("#annotationToolBarOptions").removeClass("active");
  136 +
  137 +
129 138 $(".annotationTollbar").css("display", "none");
130 139 $rootScope.isAnnotationWindowClose = true;
131 140 $("#canvasPaint").css("display", "none");
... ... @@ -349,6 +358,23 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
349 358  
350 359 }
351 360  
  361 +
  362 + $rootScope.enableEditShapeTooltip = function () {
  363 +
  364 + $("#edit-block").addClass("custom-tooltip-annotation");
  365 + $(".custom-tooltip-annotation").css('display', 'block');
  366 +
  367 + }
  368 +
  369 + $rootScope.disableEditShapeTooltip = function () {
  370 +
  371 + $(".custom-tooltip-annotation").css('display', 'none');
  372 + $("#edit-block").removeClass("custom-tooltip-annotation");
  373 +
  374 +
  375 + }
  376 +
  377 +
352 378 $rootScope.disableAnnotationToolBar = function () {
353 379  
354 380 document.getElementById('modelbackground').style.display = "none";
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @0fb9ec8
... ... @@ -22,14 +22,18 @@
22 22 <li><a href="#">Print Priview</a></li>
23 23 </ul>
24 24 </li>
25   - <li><a href="#" data-toggle="modal" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  25 + <!--#7904-->
  26 + <li><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  27 +
26 28 <li class="dropdown">
27 29 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
28 30 <ul class="dropdown-menu">
29 31 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
30 32  
31 33 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
32   - <li><a href="#" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
  34 + <!--#7904-->
  35 + <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
  36 +
33 37 <li><a href="#">Add to Existing Curriculum</a></li>
34 38 <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li>
35 39 <li role="separator" class="divider"></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0fb9ec8
... ... @@ -74,6 +74,26 @@
74 74 color: #000;
75 75 border-radius: 0;
76 76 }
  77 +
  78 + /*7931*/
  79 + .custom-tooltip-annotation-edit {
  80 + background-color: #fff;
  81 + border: 0 none;
  82 + color: #000;
  83 + left: 80px;
  84 + opacity: 0.9;
  85 + padding: 3px 0;
  86 + position: absolute;
  87 + text-align: center;
  88 + bottom: 50px;
  89 + width: 120px;
  90 + display: none;
  91 + z-index: 10000;
  92 + border: 1px solid #000;
  93 + color: #000;
  94 + border-radius: 0;
  95 + }
  96 +
77 97 </style>
78 98  
79 99  
... ... @@ -444,7 +464,10 @@
444 464 </div>
445 465 </div>
446 466 <div class="well-popup well">
447   - <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
  467 + <!--#7931-->
  468 + <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
  469 + <img id="OnEdtShape" src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
  470 +
448 471 </div>
449 472 <div class="well well-popup">
450 473 <div class="" role="group" aria-label="...">
... ... @@ -1391,6 +1414,17 @@
1391 1414 $("#draw-block").removeClass("custom-tooltip-annotation");
1392 1415 });
1393 1416  
  1417 + //#7931
  1418 + $("#OnEdtShape").on('mouseover', function () {
  1419 + $("#edit-block").addClass("custom-tooltip-annotation-edit");
  1420 + $(".custom-tooltip-annotation-edit").css('display', 'block');
  1421 +
  1422 + }).on('mouseout', function () {
  1423 +
  1424 + $(".custom-tooltip-annotation-edit").css('display', 'none');
  1425 + $("#edit-block").removeClass("custom-tooltip-annotation-edit");
  1426 + });
  1427 +
1394 1428 });
1395 1429 </script>
1396 1430  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @0fb9ec8
... ... @@ -523,9 +523,11 @@ footer.dark {
523 523 .navbar-inverse .navbar-nav > li > a {
524 524 color: #FFFFFF;
525 525 }
526   -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
  526 +/*#7904*/
  527 +.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
527 528 color: #2db0f5;
528 529 }
  530 +
529 531 ul.right0 {
530 532 right: 0!important;
531 533 left: auto;
... ... @@ -853,4 +855,6 @@ cursor:pointer;
853 855 .modeleditstyle
854 856 {
855 857 display:none;
856   -}
857 858 \ No newline at end of file
  859 +}
  860 + /*#7904*/
  861 +.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
858 862 \ No newline at end of file
... ...