74 merged request changes

Amrita Vishnoi
1 parent 53f67365
Showing 5 changed files with 89 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -2661,6 +2661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationForTBox) {
+        //debugger;
         if (isAnnotationForTBox == true) {
             //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 
             // we decide the size of speech bubble
@@ -4976,6 +4977,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $("#btnNormalMode").removeClass("btn-primary");
         }
+        //7900
+        $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
+        $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
+
+
     }
     $scope.enableNormalMode = function () {
@@ -5018,7 +5024,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //7.
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
-
+          
+        
             $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
             $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
@@ -6111,7 +6118,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $rootScope.resetText = 0;
     $rootScope.resetTextSave = 0;
     $rootScope.ObjectIndexSave = 0;
-   
+
     var arrayRect = {};
@@ -6171,7 +6178,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     rounded: true,
                     x1: $scope.offsetX1, y1: $scope.offsetY1,
                     x2: $scope.x, y2: $scope.y,
-                    
+                  
                     click: function (layer) {
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -6649,7 +6656,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
-
     //-- TextArea functionality of Annotation toolbar
     $rootScope.fontSizes;
@@ -7892,6 +7898,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
     }
+
+
+   
+
+
 }]
 );
@@ -117,6 +117,10 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
+            //7904
+            $("#annotationToolBarOptions").addClass("active");
+            $("#annotationButton").addClass("active");
+
             $rootScope.isAnnotationWindowOpen = true;
             $(".annotationTollbar").css("display", "block");
             $rootScope.$broadcast('annotationToolEvent', true);
@@ -125,7 +129,12 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.CloseAnnotationTool = function () {
-            console.log('close')
+            console.log('close');
+            //7904
+            $("#annotationButton").removeClass("active");
+            $("#annotationToolBarOptions").removeClass("active");
+
+
             $(".annotationTollbar").css("display", "none");
             $rootScope.isAnnotationWindowClose = true;
             $("#canvasPaint").css("display", "none");
@@ -349,6 +358,23 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
+
+        $rootScope.enableEditShapeTooltip = function () {
+
+            $("#edit-block").addClass("custom-tooltip-annotation");
+            $(".custom-tooltip-annotation").css('display', 'block');
+
+        }
+
+        $rootScope.disableEditShapeTooltip = function () {
+
+            $(".custom-tooltip-annotation").css('display', 'none');
+            $("#edit-block").removeClass("custom-tooltip-annotation");
+
+
+        }
+
+
         $rootScope.disableAnnotationToolBar = function () {
             document.getElementById('modelbackground').style.display = "none";
@@ -22,14 +22,18 @@
                 <li><a href="#">Print Priview</a></li>
             </ul>
         </li>
-        <li><a href="#" data-toggle="modal" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
+        <!--#7904-->
+        <li><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
+
         <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
             <ul class="dropdown-menu">
                 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
                 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
-                <li><a href="#" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
+                <!--#7904-->
+                <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
+
                 <li><a href="#">Add to Existing Curriculum</a></li>
                 <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li>
                 <li role="separator" class="divider"></li>
@@ -74,6 +74,26 @@
             color: #000;
             border-radius: 0;
         }
+
+        /*7931*/
+        .custom-tooltip-annotation-edit {
+            background-color: #fff;
+            border: 0 none;
+            color: #000;
+            left: 80px;
+            opacity: 0.9;
+            padding: 3px 0;
+            position: absolute;
+            text-align: center;
+            bottom: 50px;
+            width: 120px;
+            display: none;
+            z-index: 10000;
+            border: 1px solid #000;
+            color: #000;
+            border-radius: 0;
+        }
+
     </style>
@@ -444,7 +464,10 @@
                                 </div>
                             </div>
                             <div class="well-popup well">
-                                <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
+                                <!--#7931-->
+                                <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
+                                <img id="OnEdtShape" src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
+                            
                             </div>
                             <div class="well well-popup">
                                 <div class="" role="group" aria-label="...">
@@ -1391,6 +1414,17 @@
                 $("#draw-block").removeClass("custom-tooltip-annotation");
             });
+            //#7931
+            $("#OnEdtShape").on('mouseover', function () {
+                $("#edit-block").addClass("custom-tooltip-annotation-edit");
+                $(".custom-tooltip-annotation-edit").css('display', 'block');
+
+            }).on('mouseout', function () {
+
+                $(".custom-tooltip-annotation-edit").css('display', 'none');
+                $("#edit-block").removeClass("custom-tooltip-annotation-edit");
+            });
+
         });
     </script>
@@ -523,9 +523,11 @@ footer.dark {
 .navbar-inverse .navbar-nav > li > a {
 	color: #FFFFFF;
 }
-.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
+/*#7904*/
+.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active {
 	color: #2db0f5;
 }
+
 ul.right0 {
 	right: 0!important;
 	left: auto;
@@ -853,4 +855,6 @@ cursor:pointer;
 .modeleditstyle
  {
     display:none;
-}
 \ No newline at end of file
+}
+ /*#7904*/
+.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
 \ No newline at end of file