From 159b016f06370d041a53db82492e33969f2c210d Mon Sep 17 00:00:00 2001
From: Utkarsh Singh <utkarsh.singh@ebix.com>
Date: Tue, 28 Mar 2017 15:36:38 +0530
Subject: [PATCH] Committed code. Refs: #15352, 15361 and 15368

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js |  6 ++++++
 400-SOURCECODE/AIAHTML5.Web/index.html                      | 38 ++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index f9c9e63..4321afb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -558,6 +558,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $('#daBodyview').css("height", $(window).outerHeight());
 
                 $('#daBodyview').css("width", $(window).outerWidth());
+
+                if ($('#daImagePanel').offset().top == 0)
+                    $('#daImagePanel').css("top", '70px');
+
+                if ($('#daImagePanel').offset().left == 0)
+                    $('#daImagePanel').css("left", '1px');
             
             }, 350);
     }
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index ec400cd..0c63087 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -160,7 +160,7 @@
 
 
 </head>
-<body ng-controller="HomeController" id="bo" ng-init="initializeAIA()">
+<body ng-controller="HomeController" id="bo" ng-init="initializeAIA()" ng-keydown="CheckRefresh($event)">
     <div ng-hide="isVisibleResetPass">
         <div id="login" ng-show="isVisibleLogin">
 
@@ -203,7 +203,7 @@
                                             <span class="input-group-addon"><i class="fa fa-key"></i></span>
                                             <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
                                         </div>
-                                        <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;"id="forgotPasswordAnchor" data-toggle="modal" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
+                                        <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;" id="forgotPasswordAnchor" data-toggle="modal" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
                                     </div>
                                     <div class="form-group">
                                         <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
@@ -656,7 +656,7 @@
                                     <div class="well well-popup">
                                         <div class="" role="group" aria-label="...">
                                             <div>
-                                                <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>
+                                                <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>
                                                 <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>
 
                                                 <!--<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>-->&nbsp;
@@ -795,7 +795,7 @@
                     left: 140px;
                     display: none;
                     z-index: 780000;
-                    height:auto!important;
+                    height: auto !important;
                 }
 
                     #listManager .annotation-modal-header {
@@ -915,12 +915,12 @@
                                         </div>
                                         <div class="col-sm-6 enableDisableOpacity">
                                             <!--<div class="radio">
-                                    <label>
-                                        <input type="radio" name="filloption" id="filloption1" value="filloption1">
-                                        <span class="">Texture</span>
-                                        <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
-                                    </label>
-                            </div>-->
+                                                    <label>
+                                                        <input type="radio" name="filloption" id="filloption1" value="filloption1">
+                                                        <span class="">Texture</span>
+                                                        <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
+                                                    </label>
+                                            </div>-->
                                             <div class="radio">
                                                 <label>
                                                     <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
@@ -1019,7 +1019,7 @@
                             <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
                         </div>
                     </form>
-</div>
+                </div>
             </div>
 
             <!--Export Image Modal-->
@@ -1149,7 +1149,7 @@
             </tbody>
         </table>
     </div>
-   
+
     <div class="modal fade" id="messageModal" role="dialog">
         <div class="modal-dialog">
 
@@ -1168,7 +1168,8 @@
     <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
-                <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;"> <!--bg-primary-->
+                <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;">
+                    <!--bg-primary-->
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
                     <h5 class="text-left lhgt19 padd5" style="color:red; text-align:left;">*This module is not yet available to use, please fill in the form with complete details, a support request will be submitted to ADAM Education Sales and Support team. If needed someone from ADAM team will contact you ASAP.</h5>
                 </div>
@@ -1219,7 +1220,8 @@
     <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;">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
-                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;"> <!--color: #e5e5e5;-->
+                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;">
+                    <!--color: #e5e5e5;-->
                     <!--bg-primary-->
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                     <h5 class="text-left lhgt19 padd5" style="color:#fff; text-align:left;">Below is the list of modules available:</h5>
@@ -1440,10 +1442,9 @@
             $('#canvas').sketch();
         });
     </script>-->
-   
+
     <script>
-        function onBrushSizeChange()
-        {
+        function onBrushSizeChange() {
             $('.btnCursor').addClass('activebtncolor');
             $(".btn-annotation").removeClass("activebtncolor");
             $(".btn-annotation-erase").removeClass("activebtncolor");
@@ -1523,7 +1524,7 @@
                     $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
                 }
             });
-           
+
             $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
 
 
@@ -1918,4 +1919,5 @@
         }
     </script>
 </body>
+
 </html>
\ No newline at end of file
--
libgit2 0.21.4

