ADAM / AIAHTML5

Commit e75b61c24485101554b60ce3ef18e2fbe7357dee

Authored by Nikita Kulshreshtha
1 parent 6b403181

updated QA url for old CB, AT ad IP10. 

AA search and show all button swap
Inline Side-by-side
Showing 4 changed files with 29 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @e75b61c
... ... @@ -29,7 +29,7 @@ function ($scope, $rootScope, pages, log, $location) {
29 29  
30 30 $location.url('/');
31 31  
32   - window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + 'mod=8');
  32 + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8');
33 33  
34 34 }
35 35 else {
... ... @@ -44,7 +44,7 @@ function ($scope, $rootScope, pages, log, $location) {
44 44 var encryptedSiteId = CryptoJS.AES.encrypt($rootscope.siteId, key, { iv: iv });
45 45  
46 46  
47   - window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + 'mod=7' + '&s=' + encryptedSiteId);
  47 + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId);
48 48  
49 49  
50 50  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @e75b61c
... ... @@ -35,7 +35,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
35 35  
36 36 $location.url('/');
37 37  
38   - window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + 'mod=7');
  38 + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7');
39 39  
40 40 }
41 41 else {
... ... @@ -50,7 +50,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
50 50 var encryptedSiteId = CryptoJS.AES.encrypt($rootscope.siteId, key, { iv: iv });
51 51  
52 52  
53   - window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + 'mod=7' + '&s=' + encryptedSiteId);
  53 + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId);
54 54  
55 55 }
56 56 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @e75b61c
... ... @@ -7,7 +7,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) {
7 7 //$rootScope.currentActiveModuleTitle = $routeParams.modname;
8 8 $scope.links = [
9 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"),
  10 + new link("IP-10", "IP 10", "http://qa.interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
11 11 new link("indepth-reports", "In-Depth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),
12 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 13 new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
  View file @e75b61c
... ... @@ -52,7 +52,29 @@
52 52 </div>-->
53 53 <div class="col-md-2 col-sm-4 pad-lftrgt3">
54 54 <div class="form-group">
55   - <h6 class="text-center text-primary txt-white f11">Search</h6>
  55 +
  56 +
  57 +
  58 +
  59 + <div class="col-xs-12" style="padding:0;">
  60 + <div class="col-xs-5" style="padding:0 2px 0 0;">
  61 + <h6 class="text-center text-primary txt-white f11">Search</h6>
  62 + <button type="button" class="btn btn-primary btn-sm col-xs-12" id="searchBtnAA" ng-click="FilterByImage(1, query)">
  63 + <i class="fa fa-search"></i>
  64 + </button>
  65 + </div>
  66 + <div class="col-xs-7" style="padding:0;">
  67 + <h6 class="text-center text-primary txt-white f11" style="padding:0;">Show All</h6>
  68 + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(1, query)"><i class="fa fa-eye"></i></button>
  69 + </div>
  70 + </div>
  71 +
  72 +
  73 +
  74 +
  75 +
  76 +
  77 + <!--<h6 class="text-center text-primary txt-white f11">Search</h6>
56 78  
57 79 <div class="btn-group col-xs-12" style="padding:0;">
58 80 <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(1, query)"><i class="fa fa-eye"></i> Show All</button>
... ... @@ -60,7 +82,7 @@
60 82 <i class="fa fa-search"></i>
61 83 </button>
62 84  
63   - </div>
  85 + </div>-->
64 86  
65 87  
66 88  
... ...