ADAM / AIAHTML5

Commit 13cf7c2e1caea71ecc6bd20636e77b5d8431daea

Authored by Mukul Rajput
1 parent 9c6a79df

this is url update of admin

Inline Side-by-side
Showing 3 changed files with 5 additions and 58 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @13cf7c2
... ... @@ -4982,13 +4982,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4982 4982  
4983 4983 }
4984 4984  
4985   - $rootScope.OpenAdminForm = function (userInfo) {
4986   - $('#adminModal').css({ top: '50px' });
4987   - if ($rootScope.userData) {
4988   - $('#adminfName').val($rootScope.userData.FirstName);
4989   - $('#adminlName').val($rootScope.userData.LastName);
4990   - $('#adminEmailId').val($rootScope.userData.EmailId);
4991   - }
  4985 + $rootScope.AdminURL = function () {
  4986 + var admin_url = window.location.href;
  4987 + window.location.href = admin_url + "Admin-UI";
4992 4988 };
4993 4989  
4994 4990 $rootScope.SendAdminAccessRequestMail = function (userInfo) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @13cf7c2
... ... @@ -49,7 +49,7 @@
49 49 <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>
50 50 </ul>
51 51 </li>
52   - <li class ="navbarItem"><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-show="haveRoleAdmin">Admin</a></liclass>
  52 + <li class ="navbarItem"><a ng-click="AdminURL()">Admin</a></liclass>
53 53 </ul>
54 54 <ul class="nav navbar-nav navbar-right">
55 55 <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @13cf7c2
... ... @@ -1178,56 +1178,7 @@
1178 1178 </div>
1179 1179  
1180 1180 <!--Admin Form (Under Process)-->
1181   - <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
1182   - <div class="modal-dialog" role="document">
1183   - <div class="modal-content">
1184   - <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;">
1185   - <!--bg-primary-->
1186   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
1187   - <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>
1188   - </div>
1189   - <div class="modal-body">
1190   - <div class="panel-body">
1191   - <!-- form -->
1192   - <form class="form-horizontal" name="adminAccessRequestForm">
1193   - <div class="form-group">
1194   - <label for="inputEmail3" class="col-sm-3 control-label">First Name :</label>
1195   - <div class="col-sm-8">
1196   - <input class="form-control" id="adminfName" placeholder="" ng-model=" userinfo.firstname" ng-readonly="true">
1197   - </div>
1198   - </div>
1199   - <div class="form-group">
1200   - <label for="inputPassword3" class="col-sm-3 control-label">Last Name :</label>
1201   - <div class="col-sm-8">
1202   - <input class="form-control" id="adminlName" placeholder="" type="text" ng-model="userInfo.lastName" ng-readonly="true">
1203   - </div>
1204   - </div>
1205   - <div class="form-group">
1206   - <label for="inputPassword3" class="col-sm-3 control-label">Email Id <span class="red">*</span> :</label>
1207   - <div class="col-sm-8">
1208   - <input class="form-control" id="adminEmailId" placeholder="" type="text" ng-model="userInfo.emailId" ng-readonly="true">
1209   - </div>
1210   - </div>
1211   - <div class="form-group">
1212   - <label for="inputPassword3" class="col-sm-3 control-label">Message <span class="red">*</span> :</label>
1213   - <div class="col-sm-8">
1214   - <textarea name="adminAccessTextArea" class="form-control" rows="3" placeholder="Message" ng-model="userInfo.userMessage" required></textarea> <!--ng-show="!adminRequestTextArea.length-->
1215   - <span id="spnError" style="color: maroon; font-weight:bold" ng-show="adminAccessRequestForm.adminAccessTextArea.$invalid">Message required.</span>
1216   - </div>
1217   - </div>
1218   - <div class="form-group">
1219   - <div class="col-sm-offset-3 col-sm-8 mar-top17">
1220   - <button type="button" class="btn btn-primary btn-sm" ng-click="adminAccessRequestForm.$valid && SendAdminAccessRequestMail(userInfo)" data-toggle="modal" data-target="#mymodal"><i class="fa fa-check"></i> Submit</button>
1221   - </div>
1222   -
1223   - </div>
1224   - </form>
1225   - </div>
1226   - </div>
1227   -
1228   - </div>
1229   - </div>
1230   - </div>
  1181 +
1231 1182  
1232 1183 <!--Available modules list modal after login-->
1233 1184 <div class=" 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; position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; right: 0px; bottom: 0px; ">
... ...