ADAM / AIAHTML5

Commit a79023e027b9719e76ddc8d2686aff14f71bf45a

Authored by Nikita Kulshreshtha
2 parents 495776ca 5a0f2429

Merge branch 'PasswordResetMailBodyUpdates_Merge' into Develop

Inline Side-by-side
Showing 6 changed files with 20 additions and 11 deletions
400-SOURCECODE/AIAHTML5.API/Templates/forgot-Password.html
  View file @a79023e
... ... @@ -34,10 +34,16 @@
34 34 <td colspan='2'>&nbsp;</td>
35 35 </tr>
36 36 <tr>
37   - <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'>You can reset your password by clicking the link below:</td>
38   - </tr>
  37 + <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'>Click the Reset Password button below to reset your A.D.A.M. Interactive Anatomy™ account password</td>
  38 + </tr>
  39 + <tr>
  40 + <td colspan='2'>&nbsp;</td>
  41 + </tr>
39 42 <tr>
40   - <td colspan='2' style=' font-size:16px; font-weight:bold; color:#fff; font-family:Gotham, Helvetica, Arial, sans-serif'><a href="{resetPasswordLink}">{resetPasswordLink}</a></td>
  43 + <td width="45%" bgcolor="#0072a7" style="padding:15px 20px; cursor: pointer;" onclick="document.location.href = '{resetPasswordLink}'">
  44 + <a href="{resetPasswordLink}" style="color:#ffffff; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; display: block;">Reset Password</a>
  45 + </td>
  46 + <td width="55%" style="padding:10px 20px;">&nbsp;</td>
41 47 </tr>
42 48 <tr>
43 49 <td colspan='2'>&nbsp;</td>
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @a79023e
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @a79023e
... ... @@ -31,11 +31,11 @@
31 31 </log4net>
32 32  
33 33 <appSettings>
34   - <add key="SenderEmailAddress" value="utkarsh.singh@ebix.com" />
  34 + <add key="SenderEmailAddress" value="support@interactiveanatomy.com" />
35 35 <add key="ErrorNotificationEmailAddress" value="support@interactiveanatomy.com" />
36   - <add key="SenderPassword" value="utkarsh@3bix" />
37   - <add key="SMTPAddress" value="smtp.emailsrvr.com" />
38   - <add key="SMTPPort" value="587" />
  36 + <add key="SenderPassword" value="" />
  37 + <add key="SMTPAddress" value="10.100.12.13" />
  38 + <add key="SMTPPort" value="25" />
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @a79023e
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a79023e
... ... @@ -231,7 +231,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
231 231  
232 232 $rootScope.closeResetPasswordPopup = function () {
233 233 $("#passwordReset").fadeOut();
234   - $("#passwordReset").modal('hide');
  234 + $("#passwordReset").modal('hide');
  235 + $location.url("/");
  236 + $rootScope.isVisibleResetPass = false;
  237 + $rootScope.isVisibleLogin = true;
235 238 }
236 239  
237 240  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @a79023e
... ... @@ -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" 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>
... ... @@ -1131,8 +1131,8 @@
1131 1131 </tr>
1132 1132 <tr>
1133 1133 <td>
1134   - <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style=" color:#423030; background:#ff9900; border:1px solid #ff9900; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:gotham, 'Helvetica Neue' , helvetica, arial, sans-serif" id="btnUpdatePassword">Submit</button>
1135   - <button type="submit" id="close-resetPasswordForm" ng-click="closeResetPasswordPopup()" style="color:#423030; background:#231f20; border:1px solid #231f20; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif" data-dismiss="modal">Close</button>
  1134 + <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button>
  1135 + <button type="submit" id="close-resetPasswordForm" ng-click="closeResetPasswordPopup()" style="color:#423030; background:#666; border:1px solid #999; cursor:pointer; color:#fff; padding:5px 10px; font-size:16px; text-transform:uppercase; text-align:center; text-decoration:none; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif" data-dismiss="modal">Close</button>
1136 1136 </td>
1137 1137 </tr>
1138 1138 </tbody>
... ...