ADAM / AIAHTML5

Commit 33514e8a70fc117a7a4e6d18d0708ac766b88edd

Authored by Birendra
1 parent 45356ddf

resolve merge conflict

Inline Side-by-side
Showing 2 changed files with 33 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @33514e8
... ... @@ -6175,6 +6175,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
6175 6175 //$('#modal-settings').css("display", "none");
6176 6176 //$("#modelsettingsbackground").css("display", "none");
6177 6177 }
  6178 +
6178 6179 $rootScope.saveSettings = function () {
6179 6180  
6180 6181 var currentSkintone = $rootScope.globalSetting.ethnicity;
... ... @@ -6192,6 +6193,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
6192 6193 $rootScope.errorMessage = AIAConstants.SETTINGS_SAVED ;
6193 6194 $('#modal-settings').css("display", "none");
6194 6195 $("#modelsettingsbackground").css("display", "none");
  6196 + //hide saveSettingsMessageModal
  6197 + $("#saveSettingsMessageModal").modal('hide');
6195 6198  
6196 6199 }
6197 6200 else{
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @33514e8
... ... @@ -607,11 +607,8 @@
607 607 </div>
608 608 </div>
609 609 </div>
610   - <div class="modal-footer">
611   - <button type="button" class="btn btn-primary" ng-click="UpdateAndCloseSetting(formsetting)">OK</button>
612   -
613   - <!--<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>-->
614   - <button type="button" class="btn btn-primary" ng-click="CloseSetting()">Cancel</button>
  610 + <div class="modal-footer">
  611 + <button type="button" class="btn btn-primary" ng-click="CancelSetting()">Cancel</button>
615 612 <button type="button" class="btn btn-primary" ng-click="UpdateSetting(formsetting)">Apply</button>
616 613 </div>
617 614 </div>
... ... @@ -1079,6 +1076,34 @@
1079 1076  
1080 1077 </div>
1081 1078  
  1079 + <!-- Update Setting confirm modal-->
  1080 + <div class="modal fade notfoundSystem" id="saveSettingsMessageModal" role="dialog" aria-labelledby="myModalLabel"
  1081 + style="z-index: 1200002; top:10%">
  1082 +
  1083 + <div class="modal-dialog modal-sm">
  1084 +
  1085 + <div class="modal-content">
  1086 +
  1087 + <div class="modal-header">
  1088 +
  1089 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  1090 +
  1091 + </div>
  1092 +
  1093 + <div class="modal-title"></div>
  1094 +
  1095 + <div class="modal-header"><p style="font-size:15px;">Do you want to save current settings?</p></div>
  1096 + <div class="modal-footer">
  1097 + <button type="button" class="btn btn-primary" ng-click="saveSettings()">Yes</button>
  1098 + <button type="button" data-dismiss="modal" class="btn btn-primary" ng-click="CancelSetting()">No</button>
  1099 + </div>
  1100 +
  1101 + </div>
  1102 +
  1103 + </div>
  1104 +
  1105 + </div>
  1106 +
1082 1107 <!--Profile not updated modal-->
1083 1108 <div class=" fade ui-draggable in" data-keyboard="false" data-backdrop="static" id="profileUpdateModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; z-index: 1200002; position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; width:100% ;height:100%">
1084 1109 <div class="modal-dialog" role="document" style="width:400px">
... ...