Commit a3e88410aecbcf33f03c151a3b71032c054c9d72

Authored by Amrita Vishnoi
2 parents a37cd195 4bfd9579

Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1343,9 +1343,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1343,9 +1343,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1343 } 1343 }
1344 //set scrollbars on canvas and hide loading label 1344 //set scrollbars on canvas and hide loading label
1345 1345
1346 - // var isiOSSafari = (navigator.userAgent.match(/like Mac OS X/i)) ? true : false;  
1347 - var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;  
1348 - 1346 + //check the OS
  1347 + var isiOSSafari = (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) ? true : false;
  1348 +
1349 //set scrollbars on canvas and hide loading label 1349 //set scrollbars on canvas and hide loading label
1350 $('#daLoaderLabel').css('visibility', 'hidden') 1350 $('#daLoaderLabel').css('visibility', 'hidden')
1351 1351
@@ -9434,6 +9434,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9434,6 +9434,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9434 } 9434 }
9435 9435
9436 $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) { 9436 $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) {
  9437 + $rootScope.isLoading = true;
  9438 + $('#spinner').css('visibility', 'visible');
9437 $rootScope.selectedBodySystemId = bodysystemId; 9439 $rootScope.selectedBodySystemId = bodysystemId;
9438 $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val(); 9440 $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val();
9439 $("#bodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); 9441 $("#bodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
@@ -9457,7 +9459,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9457,7 +9459,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9457 .where('_SystemNumber == ' + bodysystemId) 9459 .where('_SystemNumber == ' + bodysystemId)
9458 .select(); 9460 .select();
9459 if (systemMatchedTermList != null || systemMatchedTermList != undefined) { 9461 if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
9460 - 9462 + $rootScope.isLoading = false;
  9463 + $('#spinner').css('visibility', 'hidden');
9461 $scope.refreshTerms(systemMatchedTermList); 9464 $scope.refreshTerms(systemMatchedTermList);
9462 } 9465 }
9463 }, 9466 },
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -5227,13 +5227,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -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 $rootScope.SendAdminAccessRequestMail = function (userInfo) { 5234 $rootScope.SendAdminAccessRequestMail = function (userInfo) {
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
1 -'use strict';  
2 -  
3 -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",  
4 -function ($scope, $rootScope, log, $location, pages, $routeParams) {  
5 -  
6 - //$rootScope.currentActiveModuleTitle = Modules[10].Name;  
7 - //$rootScope.currentActiveModuleTitle = $routeParams.modname;  
8 - $scope.links = [  
9 - new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),  
10 - new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),  
11 - new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),  
12 - new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"),  
13 - new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),  
14 - new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),  
15 - new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),  
16 - new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")  
17 - ];  
18 -  
19 - $scope.$on('$viewContentLoaded', function (event) {  
20 -  
21 -  
22 - if ($rootScope.refreshcheck == null) {  
23 - $location.path('/');  
24 - }  
25 - // code that will be executed ...  
26 - // every time this view is loaded  
27 -  
28 -  
29 - for (var i = 0; i < $scope.links.length; i++) {  
30 - if ($scope.links[i].modname == $routeParams.modname) {  
31 - $rootScope.currentActiveModuleTitle = $scope.links[i].title;  
32 - if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")  
33 - {  
34 - // document.getElementById('externalLink').style.height = "1024px";  
35 - document.getElementById('externalLink').style.height = $(window).outerHeight() - 128+"px";  
36 -  
37 - }  
38 - $scope.objdata = $scope.links[i].objurl;  
39 - $scope.myObj = $scope.links[i].objstyle;  
40 - }  
41 - }  
42 - });  
43 -  
44 - $scope.showTabButton = false;  
45 - $scope.IsVisible = function () {  
46 - $scope.scroll();  
47 -  
48 - }  
49 -  
50 - $scope.scroll = function () {  
51 - // $window.scrollTo(0, 0);  
52 - $("html,body").scrollTop(0);  
53 - //alert("scroll");  
54 - }  
55 -}]  
56 -  
57 -  
58 -);  
59 -  
60 - 1 +'use strict';
  2 +
  3 +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",
  4 +function ($scope, $rootScope, log, $location, pages, $routeParams) {
  5 +
  6 + //$rootScope.currentActiveModuleTitle = Modules[10].Name;
  7 + //$rootScope.currentActiveModuleTitle = $routeParams.modname;
  8 + $scope.links = [
  9 + new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),
  10 + new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
  11 + new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),
  12 + new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"),
  13 + new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),
  14 + new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),
  15 + new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),
  16 + new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
  17 + ];
  18 +
  19 + $scope.$on('$viewContentLoaded', function (event) {
  20 +
  21 +
  22 + if ($rootScope.refreshcheck == null) {
  23 + $location.path('/');
  24 + }
  25 + // code that will be executed ...
  26 + // every time this view is loaded
  27 +
  28 + var $uaAOD = navigator.userAgent;
  29 + for (var i = 0; i < $scope.links.length; i++) {
  30 + if ($scope.links[i].modname == $routeParams.modname) {
  31 + $rootScope.currentActiveModuleTitle = $scope.links[i].title;
  32 + if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")
  33 + {
  34 + // document.getElementById('externalLink').style.height = "1024px";
  35 + if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) {
  36 + document.getElementById('externalLink').style.height = 2048 + "px";
  37 + }
  38 + else {
  39 + document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px";
  40 + }
  41 +
  42 +
  43 +
  44 + }
  45 + $scope.objdata = $scope.links[i].objurl;
  46 + $scope.myObj = $scope.links[i].objstyle;
  47 + }
  48 + }
  49 + });
  50 +
  51 + $scope.showTabButton = false;
  52 + $scope.IsVisible = function () {
  53 + $scope.scroll();
  54 +
  55 + }
  56 +
  57 + $scope.scroll = function () {
  58 + // $window.scrollTo(0, 0);
  59 + $("html,body").scrollTop(0);
  60 + //alert("scroll");
  61 + }
  62 +}]
  63 +
  64 +
  65 +);
  66 +
  67 +
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1395,6 +1395,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1395,6 +1395,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1395 1395
1396 $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) { 1396 $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
1397 $rootScope.bodySystemSeletedId = bodySystemId; 1397 $rootScope.bodySystemSeletedId = bodySystemId;
  1398 + $("#AABodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  1399 + $("#AABodySystems").find("option[id=" + bodySystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
1398 $('#termList').empty(); 1400 $('#termList').empty();
1399 var bodySystemName = $("#AABodySystems #" + bodySystemId).val(); 1401 var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
1400 if (bodySystemName == "All") { 1402 if (bodySystemName == "All") {
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
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 + <!--redirecting to Admin-->
  53 + <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" style="cursor: pointer;">Admin</a></liclass>
  54 + </ul>
  55 + <ul class="nav navbar-nav navbar-right">
  56 + <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
  57 + <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>
  58 + </ul>
  59 + <div id="imaginary_container" style="visibility:hidden">
  60 + <div class="input-group stylish-input-group paddTop5 hidden-sm">
  61 + <input type="text" class="form-control width120" placeholder="Search">
  62 + <span class="input-group-addon">
  63 + <button type="submit">
  64 + <span class="fa fa-search color-green"></span>
  65 + </button>
  66 + </span>
  67 + </div>
  68 +
  69 + <div class="visible-sm visible-md pull-right marginTop5">
  70 + <div class="dropdown">
  71 + <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
  72 + <i class="fa fa-search color-white"></i>
  73 + </button>
  74 + <!--<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>-->
  75 + <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
  76 + <li>
  77 + <!--<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>-->
  78 + <div class="input-group stylish-input-group ">
  79 + <input type="text" class="form-control" placeholder="Search" style="width:100%;">
  80 + <span class="input-group-addon">
  81 + <button type="submit">
  82 + <span class="fa fa-search color-green"></span>
  83 + </button>
  84 + </span>
  85 + </div>
  86 + </li>
  87 + </ul>
  88 + </div>
  89 + </div>
  90 + </div>
  91 +
91 </div> 92 </div>
92 \ No newline at end of file 93 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1186,56 +1186,7 @@ @@ -1186,56 +1186,7 @@
1186 </div> 1186 </div>
1187 1187
1188 <!--Admin Form (Under Process)--> 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 <!--Available modules list modal after login--> 1191 <!--Available modules list modal after login-->
1241 <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; "> 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; ">
@@ -1992,6 +1943,37 @@ @@ -1992,6 +1943,37 @@
1992 } 1943 }
1993 </script> 1944 </script>
1994 <script> 1945 <script>
  1946 + if (navigator.userAgent.match(/Android/i)) {
  1947 +
  1948 + $("#bodySystems").click(function () {
  1949 +
  1950 + $("#listManager").draggable('disable');
  1951 +
  1952 + }).blur(function () {
  1953 +
  1954 + $("#listManager").draggable('enable');
  1955 +
  1956 + });
  1957 +
  1958 +
  1959 +
  1960 + $("#termList").click(function () {
  1961 +
  1962 + $("#listManager").draggable('disable');
  1963 +
  1964 + }).blur(function () {
  1965 +
  1966 + $("#listManager").draggable('enable');
  1967 +
  1968 + });
  1969 +
  1970 + $("#borderWidthCanvasElement").click(function () {
  1971 +
  1972 + $("#modeleditstyle").draggable('disable');
  1973 + }).blur(function () {
  1974 + $("#modeleditstyle").draggable('enable');
  1975 + });
  1976 + }
1995 function ResizeImage(sizePercent) { 1977 function ResizeImage(sizePercent) {
1996 var autoWidth = 427; 1978 var autoWidth = 427;
1997 var autoHeight = 547; 1979 var autoHeight = 547;