ADAM / AIAHTML5

Commit 3484b5c4fb6a10b347522c7777c06591cb184c48

Authored by Mukul Rajput
1 parent 406ea973

this is solution for bug redirect admin url

Inline Side-by-side
Showing 3 changed files with 93 additions and 147 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3484b5c
... ... @@ -5227,13 +5227,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
5227 5227  
5228 5228 }
5229 5229  
5230   - $rootScope.OpenAdminForm = function (userInfo) {
5231   - $('#adminModal').css({ top: '50px' });
5232   - if ($rootScope.userData) {
5233   - $('#adminfName').val($rootScope.userData.FirstName);
5234   - $('#adminlName').val($rootScope.userData.LastName);
5235   - $('#adminEmailId').val($rootScope.userData.EmailId);
5236   - }
  5230 + $rootScope.reDirectURLToAdmin = function () {
  5231 + window.location.href = "Admin-UI";
5237 5232 };
5238 5233  
5239 5234 $rootScope.SendAdminAccessRequestMail = function (userInfo) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @3484b5c
1   -<div class="collapse navbar-collapse" id="topFixedNavbar1">
2   - <ul class="nav navbar-nav toperMenu-spaceleft">
3   - <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
4   - <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
5   - <ul class="dropdown-menu">
6   - <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
7   - <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
8   - <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
9   - <li role="separator" class="divider"></li>
10   - <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
11   - <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
12   - <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
13   - <li role="separator" class="divider"></li>
14   - <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
15   - <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
16   - <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
17   - <li role="separator" class="divider"></li>
18   - <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
19   - <li role="separator" class="divider"></li>
20   - <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
21   - <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
22   - <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
23   - </ul>
24   - </li>
25   - <!--#7904-->
26   - <li class="navbarItem" ng-class=" disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
27   -
28   - <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
29   - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
30   - <ul class="dropdown-menu">
31   - <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
32   -
33   - <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
34   - <!--#7904-->
35   - <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
36   -
37   - <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
38   - <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
39   - <li role="separator" class="divider"></li>
40   - <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
41   - </ul>
42   - </li>
43   - <li class="dropdown navbarDropdownItem">
44   - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
45   - <ul class="dropdown-menu">
46   - <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li>
47   - <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
48   - <li role="separator" class="divider"></li>
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   - </ul>
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>
53   - </ul>
54   - <ul class="nav navbar-nav navbar-right">
55   - <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
56   - <li class="hidden-xs marginR5 logOut" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
57   - </ul>
58   - <div id="imaginary_container" style="visibility:hidden">
59   - <div class="input-group stylish-input-group paddTop5 hidden-sm">
60   - <input type="text" class="form-control width120" placeholder="Search">
61   - <span class="input-group-addon">
62   - <button type="submit">
63   - <span class="fa fa-search color-green"></span>
64   - </button>
65   - </span>
66   - </div>
67   -
68   - <div class="visible-sm visible-md pull-right marginTop5">
69   - <div class="dropdown">
70   - <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
71   - <i class="fa fa-search color-white"></i>
72   - </button>
73   - <!--<div class="hidden-xs marginR5 dropdown-toggle marginTop5" id="dropdownMenu1" data-toggle="dropdown" data-placement="top" title="Logout"><a href="index.html"><i class="fa fa-search color-white"></i></a></div>-->
74   - <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
75   - <li>
76   - <!--<div class="input-group"><input type="text" aria-label="Amount (to the nearest dollar)" class="form-control"> <span class="input-group-addon"><i class="fa fa-search color-green"></i></span> </div>-->
77   - <div class="input-group stylish-input-group ">
78   - <input type="text" class="form-control" placeholder="Search" style="width:100%;">
79   - <span class="input-group-addon">
80   - <button type="submit">
81   - <span class="fa fa-search color-green"></span>
82   - </button>
83   - </span>
84   - </div>
85   - </li>
86   - </ul>
87   - </div>
88   - </div>
89   - </div>
90   -
  1 +<div class="collapse navbar-collapse" id="topFixedNavbar1">
  2 + <ul class="nav navbar-nav toperMenu-spaceleft">
  3 + <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
  4 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
  5 + <ul class="dropdown-menu">
  6 + <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
  7 + <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
  8 + <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
  9 + <li role="separator" class="divider"></li>
  10 + <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
  11 + <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
  12 + <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
  13 + <li role="separator" class="divider"></li>
  14 + <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
  15 + <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
  16 + <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
  17 + <li role="separator" class="divider"></li>
  18 + <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
  19 + <li role="separator" class="divider"></li>
  20 + <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
  21 + <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
  22 + <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
  23 + </ul>
  24 + </li>
  25 + <!--#7904-->
  26 + <li class="navbarItem" ng-class=" disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  27 +
  28 + <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
  29 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
  30 + <ul class="dropdown-menu">
  31 + <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
  32 +
  33 + <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
  34 + <!--#7904-->
  35 + <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
  36 +
  37 + <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
  38 + <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
  39 + <li role="separator" class="divider"></li>
  40 + <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
  41 + </ul>
  42 + </li>
  43 + <li class="dropdown navbarDropdownItem">
  44 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
  45 + <ul class="dropdown-menu">
  46 + <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li>
  47 + <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
  48 + <li role="separator" class="divider"></li>
  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 + </ul>
  51 + </li>
  52 + <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" style="cursor: pointer;">Admin</a></liclass>
  53 + </ul>
  54 + <ul class="nav navbar-nav navbar-right">
  55 + <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
  56 + <li class="hidden-xs marginR5 logOut" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
  57 + </ul>
  58 + <div id="imaginary_container" style="visibility:hidden">
  59 + <div class="input-group stylish-input-group paddTop5 hidden-sm">
  60 + <input type="text" class="form-control width120" placeholder="Search">
  61 + <span class="input-group-addon">
  62 + <button type="submit">
  63 + <span class="fa fa-search color-green"></span>
  64 + </button>
  65 + </span>
  66 + </div>
  67 +
  68 + <div class="visible-sm visible-md pull-right marginTop5">
  69 + <div class="dropdown">
  70 + <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
  71 + <i class="fa fa-search color-white"></i>
  72 + </button>
  73 + <!--<div class="hidden-xs marginR5 dropdown-toggle marginTop5" id="dropdownMenu1" data-toggle="dropdown" data-placement="top" title="Logout"><a href="index.html"><i class="fa fa-search color-white"></i></a></div>-->
  74 + <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
  75 + <li>
  76 + <!--<div class="input-group"><input type="text" aria-label="Amount (to the nearest dollar)" class="form-control"> <span class="input-group-addon"><i class="fa fa-search color-green"></i></span> </div>-->
  77 + <div class="input-group stylish-input-group ">
  78 + <input type="text" class="form-control" placeholder="Search" style="width:100%;">
  79 + <span class="input-group-addon">
  80 + <button type="submit">
  81 + <span class="fa fa-search color-green"></span>
  82 + </button>
  83 + </span>
  84 + </div>
  85 + </li>
  86 + </ul>
  87 + </div>
  88 + </div>
  89 + </div>
  90 +
91 91 </div>
92 92 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @3484b5c
... ... @@ -1186,56 +1186,7 @@
1186 1186 </div>
1187 1187  
1188 1188 <!--Admin Form (Under Process)-->
1189   - <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
1190   - <div class="modal-dialog" role="document">
1191   - <div class="modal-content">
1192   - <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;">
1193   - <!--bg-primary-->
1194   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
1195   - <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>
1196   - </div>
1197   - <div class="modal-body">
1198   - <div class="panel-body">
1199   - <!-- form -->
1200   - <form class="form-horizontal" name="adminAccessRequestForm">
1201   - <div class="form-group">
1202   - <label for="inputEmail3" class="col-sm-3 control-label">First Name :</label>
1203   - <div class="col-sm-8">
1204   - <input class="form-control" id="adminfName" placeholder="" ng-model=" userinfo.firstname" ng-readonly="true">
1205   - </div>
1206   - </div>
1207   - <div class="form-group">
1208   - <label for="inputPassword3" class="col-sm-3 control-label">Last Name :</label>
1209   - <div class="col-sm-8">
1210   - <input class="form-control" id="adminlName" placeholder="" type="text" ng-model="userInfo.lastName" ng-readonly="true">
1211   - </div>
1212   - </div>
1213   - <div class="form-group">
1214   - <label for="inputPassword3" class="col-sm-3 control-label">Email Id <span class="red">*</span> :</label>
1215   - <div class="col-sm-8">
1216   - <input class="form-control" id="adminEmailId" placeholder="" type="text" ng-model="userInfo.emailId" ng-readonly="true">
1217   - </div>
1218   - </div>
1219   - <div class="form-group">
1220   - <label for="inputPassword3" class="col-sm-3 control-label">Message <span class="red">*</span> :</label>
1221   - <div class="col-sm-8">
1222   - <textarea name="adminAccessTextArea" class="form-control" rows="3" placeholder="Message" ng-model="userInfo.userMessage" required></textarea> <!--ng-show="!adminRequestTextArea.length-->
1223   - <span id="spnError" style="color: maroon; font-weight:bold" ng-show="adminAccessRequestForm.adminAccessTextArea.$invalid">Message required.</span>
1224   - </div>
1225   - </div>
1226   - <div class="form-group">
1227   - <div class="col-sm-offset-3 col-sm-8 mar-top17">
1228   - <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>
1229   - </div>
1230   -
1231   - </div>
1232   - </form>
1233   - </div>
1234   - </div>
1235   -
1236   - </div>
1237   - </div>
1238   - </div>
  1189 +
1239 1190  
1240 1191 <!--Available modules list modal after login-->
1241 1192 <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; ">
... ...