ADAM / AIAHTML5

Commit ffb853adaedf37f3903746b373e015862e5bc1d4

Authored by Amrita Vishnoi
2 parents 31b4663f 50e27950

Merge branch 'AppRefreshIssue' into Develop

Inline Side-by-side
Showing 3 changed files with 31 additions and 18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ffb853a
... ... @@ -558,6 +558,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
558 558 $('#daBodyview').css("height", $(window).outerHeight());
559 559  
560 560 $('#daBodyview').css("width", $(window).outerWidth());
  561 +
  562 + if ($('#daImagePanel').offset().top == 0)
  563 + $('#daImagePanel').css("top", '70px');
  564 +
  565 + if ($('#daImagePanel').offset().left == 0)
  566 + $('#daImagePanel').css("left", '1px');
561 567  
562 568 }, 350);
563 569 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ffb853a
... ... @@ -3358,5 +3358,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3358 3358 $("#cursor-block").html();
3359 3359  
3360 3360 }
  3361 +
  3362 + $rootScope.CheckRefresh = function (e) {
  3363 + if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
  3364 + $location.path('/');
  3365 + };
3361 3366 }]
3362 3367 );
3363 3368 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ffb853a
... ... @@ -160,7 +160,7 @@
160 160  
161 161  
162 162 </head>
163   -<body ng-controller="HomeController" id="bo" ng-init="initializeAIA()">
  163 +<body ng-controller="HomeController" id="bo" ng-init="initializeAIA()" ng-keydown="CheckRefresh($event)">
164 164 <div ng-hide="isVisibleResetPass">
165 165 <div id="login" ng-show="isVisibleLogin">
166 166  
... ... @@ -203,7 +203,7 @@
203 203 <span class="input-group-addon"><i class="fa fa-key"></i></span>
204 204 <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
205 205 </div>
206   - <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"-->
  206 + <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"-->
207 207 </div>
208 208 <div class="form-group">
209 209 <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
... ... @@ -656,7 +656,7 @@
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="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>
  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 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 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>-->&nbsp;
... ... @@ -795,7 +795,7 @@
795 795 left: 140px;
796 796 display: none;
797 797 z-index: 780000;
798   - height:auto!important;
  798 + height: auto !important;
799 799 }
800 800  
801 801 #listManager .annotation-modal-header {
... ... @@ -915,12 +915,12 @@
915 915 </div>
916 916 <div class="col-sm-6 enableDisableOpacity">
917 917 <!--<div class="radio">
918   - <label>
919   - <input type="radio" name="filloption" id="filloption1" value="filloption1">
920   - <span class="">Texture</span>
921   - <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
922   - </label>
923   - </div>-->
  918 + <label>
  919 + <input type="radio" name="filloption" id="filloption1" value="filloption1">
  920 + <span class="">Texture</span>
  921 + <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
  922 + </label>
  923 + </div>-->
924 924 <div class="radio">
925 925 <label>
926 926 <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
... ... @@ -1019,7 +1019,7 @@
1019 1019 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
1020 1020 </div>
1021 1021 </form>
1022   -</div>
  1022 + </div>
1023 1023 </div>
1024 1024  
1025 1025 <!--Export Image Modal-->
... ... @@ -1149,7 +1149,7 @@
1149 1149 </tbody>
1150 1150 </table>
1151 1151 </div>
1152   -
  1152 +
1153 1153 <div class="modal fade" id="messageModal" role="dialog">
1154 1154 <div class="modal-dialog">
1155 1155  
... ... @@ -1168,7 +1168,8 @@
1168 1168 <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
1169 1169 <div class="modal-dialog" role="document">
1170 1170 <div class="modal-content">
1171   - <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;"> <!--bg-primary-->
  1171 + <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;">
  1172 + <!--bg-primary-->
1172 1173 <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
1173 1174 <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>
1174 1175 </div>
... ... @@ -1219,7 +1220,8 @@
1219 1220 <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 1221 <div class="modal-dialog" role="document">
1221 1222 <div class="modal-content">
1222   - <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;"> <!--color: #e5e5e5;-->
  1223 + <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;">
  1224 + <!--color: #e5e5e5;-->
1223 1225 <!--bg-primary-->
1224 1226 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
1225 1227 <h5 class="text-left lhgt19 padd5" style="color:#fff; text-align:left;">Below is the list of modules available:</h5>
... ... @@ -1440,10 +1442,9 @@
1440 1442 $('#canvas').sketch();
1441 1443 });
1442 1444 </script>-->
1443   -
  1445 +
1444 1446 <script>
1445   - function onBrushSizeChange()
1446   - {
  1447 + function onBrushSizeChange() {
1447 1448 $('.btnCursor').addClass('activebtncolor');
1448 1449 $(".btn-annotation").removeClass("activebtncolor");
1449 1450 $(".btn-annotation-erase").removeClass("activebtncolor");
... ... @@ -1523,7 +1524,7 @@
1523 1524 $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
1524 1525 }
1525 1526 });
1526   -
  1527 +
1527 1528 $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
1528 1529  
1529 1530  
... ... @@ -1918,4 +1919,5 @@
1918 1919 }
1919 1920 </script>
1920 1921 </body>
  1922 +
1921 1923 </html>
1922 1924 \ No newline at end of file
... ...