From 3484b5c4fb6a10b347522c7777c06591cb184c48 Mon Sep 17 00:00:00 2001
From: Mukul <mukul@ebix.com>
Date: Thu, 25 Jan 2018 13:07:45 +0530
Subject: [PATCH] this is solution for bug redirect admin url

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js |   9 ++-------
 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html           | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------
 400-SOURCECODE/AIAHTML5.Web/index.html                        |  51 +--------------------------------------------------
 3 files changed, 93 insertions(+), 147 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index e4a3251..51c1aea 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -5227,13 +5227,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
     }
 
-    $rootScope.OpenAdminForm = function (userInfo) {
-        $('#adminModal').css({ top: '50px' });
-        if ($rootScope.userData) {
-            $('#adminfName').val($rootScope.userData.FirstName);
-            $('#adminlName').val($rootScope.userData.LastName);
-            $('#adminEmailId').val($rootScope.userData.EmailId);
-        }
+    $rootScope.reDirectURLToAdmin = function () {
+        window.location.href = "Admin-UI";
     };
 
     $rootScope.SendAdminAccessRequestMail = function (userInfo) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
index a869b1b..563659f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -1,91 +1,91 @@
-<div class="collapse navbar-collapse" id="topFixedNavbar1">
-    <ul class="nav navbar-nav toperMenu-spaceleft">
-        <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
-            <ul class="dropdown-menu">
-                <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
-                <li role="separator" class="divider"></li>
-                <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
-                <li role="separator" class="divider"></li>
-                <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
-                <li role="separator" class="divider"></li>
-                <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
-                <li role="separator" class="divider"></li>
-                <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
-                <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
-                <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
-            </ul>
-        </li>
-        <!--#7904-->
-        <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>
-
-        <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
-            <ul class="dropdown-menu">
-                <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
-
-                <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
-                <!--#7904-->
-                <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
-
-                <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
-                <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
-                <li role="separator" class="divider"></li>
-                <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
-            </ul>
-        </li>
-        <li class="dropdown navbarDropdownItem">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
-            <ul class="dropdown-menu">
-                <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li>
-                <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
-                <li role="separator" class="divider"></li>
-                <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>
-            </ul>
-        </li>
-        <li class ="navbarItem"><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-show="haveRoleAdmin">Admin</a></liclass>
-    </ul>
-    <ul class="nav navbar-nav navbar-right">
-        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
-        <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>
-    </ul>
-    <div id="imaginary_container" style="visibility:hidden">
-        <div class="input-group stylish-input-group paddTop5 hidden-sm">
-            <input type="text" class="form-control width120" placeholder="Search">
-            <span class="input-group-addon">
-                <button type="submit">
-                    <span class="fa fa-search color-green"></span>
-                </button>
-            </span>
-        </div>
-
-        <div class="visible-sm visible-md pull-right marginTop5">
-            <div class="dropdown">
-                <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
-                    <i class="fa fa-search color-white"></i>
-                </button>
-                <!--<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>-->
-                <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
-                    <li>
-                        <!--<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>-->
-                        <div class="input-group stylish-input-group ">
-                            <input type="text" class="form-control" placeholder="Search" style="width:100%;">
-                            <span class="input-group-addon">
-                                <button type="submit">
-                                    <span class="fa fa-search color-green"></span>
-                                </button>
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-
+<div class="collapse navbar-collapse" id="topFixedNavbar1">
+    <ul class="nav navbar-nav toperMenu-spaceleft">
+        <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Pictures</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open My Animations</a></li>
+                <li role="separator" class="divider"></li>
+                <li ng-class="disableSubMenu"><a href="#">Test Creator</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Test</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Test As</a></li>
+                <li role="separator" class="divider"></li>
+                <li ng-class="disableSubMenu"><a href="#">New Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Open Existing Curriculum</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Save Curriculum As</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a href="" id="exportImageAnchor" data-toggle="modal" ng-click="ShowExportImageWindow()">Export Image</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a href="" id="printAVAnchor" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
+                <li ng-class="disableSubMenu"><a href="#">Print All Open Viewers</a></li>
+                <li><a href="" id="printPreviewAnchor" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
+            </ul>
+        </li>
+        <!--#7904-->
+        <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>
+
+        <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
+
+                <li ng-class="" id="optionsListManagerTab"><a href="#" ng-click="ShowListManager()">List Manager</a></li>
+                <!--#7904-->
+                <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
+
+                <li ng-class="disableSubMenu"><a href="#">Add to Existing Curriculum</a></li>
+                <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
+                <li role="separator" class="divider"></li>
+                <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li>
+            </ul>
+        </li>
+        <li class="dropdown navbarDropdownItem">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li>
+                <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
+                <li role="separator" class="divider"></li>
+                <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>
+            </ul>
+        </li>
+        <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" style="cursor: pointer;">Admin</a></liclass>
+    </ul>
+    <ul class="nav navbar-nav navbar-right">
+        <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
+        <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>
+    </ul>
+    <div id="imaginary_container" style="visibility:hidden">
+        <div class="input-group stylish-input-group paddTop5 hidden-sm">
+            <input type="text" class="form-control width120" placeholder="Search">
+            <span class="input-group-addon">
+                <button type="submit">
+                    <span class="fa fa-search color-green"></span>
+                </button>
+            </span>
+        </div>
+
+        <div class="visible-sm visible-md pull-right marginTop5">
+            <div class="dropdown">
+                <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
+                    <i class="fa fa-search color-white"></i>
+                </button>
+                <!--<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>-->
+                <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
+                    <li>
+                        <!--<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>-->
+                        <div class="input-group stylish-input-group ">
+                            <input type="text" class="form-control" placeholder="Search" style="width:100%;">
+                            <span class="input-group-addon">
+                                <button type="submit">
+                                    <span class="fa fa-search color-green"></span>
+                                </button>
+                            </span>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
 </div>
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index f239026..05dc4b4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1186,56 +1186,7 @@
     </div>
 
     <!--Admin Form (Under Process)-->
-    <div class="modal fade ui-draggable in" id="adminModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; ">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header ui-draggable-handle" style="color: #e5e5e5;">
-                    <!--bg-primary-->
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" id="btnCloseAAModal" ng-click="CloseAAModal()"><span aria-hidden="true">×</span></button>
-                    <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>
-                </div>
-                <div class="modal-body">
-                    <div class="panel-body">
-                        <!-- form -->
-                        <form class="form-horizontal" name="adminAccessRequestForm">
-                            <div class="form-group">
-                                <label for="inputEmail3" class="col-sm-3 control-label">First Name :</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" id="adminfName" placeholder="" ng-model=" userinfo.firstname" ng-readonly="true">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="inputPassword3" class="col-sm-3 control-label">Last Name :</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" id="adminlName" placeholder="" type="text" ng-model="userInfo.lastName" ng-readonly="true">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="inputPassword3" class="col-sm-3 control-label">Email Id <span class="red">*</span> :</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" id="adminEmailId" placeholder="" type="text" ng-model="userInfo.emailId" ng-readonly="true">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="inputPassword3" class="col-sm-3 control-label">Message <span class="red">*</span> :</label>
-                                <div class="col-sm-8">
-                                    <textarea name="adminAccessTextArea" class="form-control" rows="3" placeholder="Message" ng-model="userInfo.userMessage" required></textarea> <!--ng-show="!adminRequestTextArea.length-->
-                                    <span id="spnError" style="color: maroon; font-weight:bold" ng-show="adminAccessRequestForm.adminAccessTextArea.$invalid">Message required.</span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="col-sm-offset-3 col-sm-8 mar-top17">
-                                    <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>
-                                </div>
-
-                            </div>
-                        </form>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
+   
 
     <!--Available modules list modal after login-->
     <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; ">
--
libgit2 0.21.4