ADAM / AIAHTML5

Commit 75dc97772c3dbc36c69f64f70da1e0cb2656f292

Authored by Amrita Vishnoi
2 parents a5b3697f 299bad19

Merge branch 'modalbackgroundissue' into Develop

Inline Side-by-side
Showing 2 changed files with 15 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @75dc977
... ... @@ -87,6 +87,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
87 87 $rootScope.haveRoleAdmin;
88 88 var isfilloptionChecked = "";
89 89 var isOutlineOptionChecked = "";
  90 + $rootScope.forgotPwdModalShow = function ()
  91 + {
  92 + $("#forgotPwdModal").modal("show");
  93 + $(".modal-backdrop").css("opacity",".5");
  94 + }
  95 + $rootScope.forgotUserModalShow=function()
  96 + {
  97 + $("#forgotUserModal").modal("show");
  98 + $(".modal-backdrop").css("opacity", ".5");
  99 +
  100 + }
90 101 $rootScope.initializeAIA = function () {
91 102  
92 103 $rootScope.isLoading = false;
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @75dc977
... ... @@ -196,7 +196,7 @@
196 196 <span class="input-group-addon"><i class="fa fa-user"></i></span>
197 197 <input type="text" class="form-control" placeholder="Username" ng-model="userInfo.username">
198 198 </div>
199   - <span class="help-block text-right small"><a href="#" class="color-white" id="forgotUserIdAnchor" data-toggle="modal" data-target=".forgot-sm">Forgot User ID?</a></span>
  199 + <span class="help-block text-right small"><a href="#" class="color-white" id="forgotUserIdAnchor" data-toggle="modal" ng-click="forgotUserModalShow()" data-target=".forgot-sm">Forgot User ID?</a></span>
200 200  
201 201  
202 202 </div>
... ... @@ -208,7 +208,7 @@
208 208 <span class="input-group-addon"><i class="fa fa-key"></i></span>
209 209 <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
210 210 </div>
211   - <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"-->
  211 + <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;" id="forgotPasswordAnchor" data-toggle="modal" ng-click="forgotPwdModalShow();" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
212 212 </div>
213 213 <div class="form-group">
214 214 <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
... ... @@ -230,7 +230,7 @@
230 230 </footer>
231 231 </div>
232 232 <!-- Forgot User ID (Small modal) -->
233   - <div class="modal fade forgot-sm" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
  233 + <div class="modal fade" id="forgotUserModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm">
234 234 <div class="modal-dialog modal-sm" role="document">
235 235 <div class="modal-content">
236 236 <div class="modal-header">
... ... @@ -255,7 +255,7 @@
255 255 </div>
256 256 </div>
257 257 <!-- Forgot Password (Small modal) -->
258   - <div class="modal fade forgot-sm1" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
  258 + <div class="modal fade" id="forgotPwdModal" role="dialog" tabindex="-1" aria-labelledby="exampleModalLabel" data-target=".forgot-sm1">
259 259 <div class="modal-dialog modal-sm" role="document">
260 260 <div class="modal-content">
261 261 <div class="modal-header">
... ...