ADAM / AIAHTML5

Commit 6570266fd06c1fd2c92cba4302857385a9c2f8cf

Authored by Nikita Kulshreshtha
1 parent d88fb2b4

replaced js files from Develop-IPAD-MAC and replaced assests path in index.html

Inline Side-by-side
Showing 3 changed files with 4 additions and 58 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @6570266
... ... @@ -501,11 +501,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
501 501  
502 502  
503 503 $scope.openView = function ($event) {
504   -<<<<<<< HEAD
505   -
506   -=======
507 504  
508   ->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
509 505 $rootScope.MenuModuleName = "CI";
510 506 $rootScope.disableAnnotationTB = false;
511 507 $rootScope.CIAnotationIdentifyModeOff = true;
... ... @@ -527,10 +523,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
527 523  
528 524 }
529 525  
530   -<<<<<<< HEAD
531   -
532   -=======
533   ->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
534 526 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
535 527 localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
536 528  
... ... @@ -546,10 +538,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
546 538  
547 539 $scope.openBodyView = function () {
548 540  
549   -<<<<<<< HEAD
550   -
551   -=======
552   ->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
553 541 if ($rootScope.refreshcheck == null) {
554 542 $location.path('/');
555 543 }
... ... @@ -558,38 +546,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
558 546 $('#spinner').css('visibility', 'visible');
559 547 $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
560 548  
561   -<<<<<<< HEAD
562   - // alert($scope.voId);
563   -
564   -
565   - //once you get id in scope push detail in jspanel content
566   -
567   - var openViews;
568   - if ($rootScope.openViews.length > 0) {
569   - openViews = new jinqJs()
570   - .from($rootScope.openViews)
571   - .where("BodyViewId==" + $scope.voId)
572   - .select();
573   - }
574   - var counter = 1;
575   - var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
576   -
577   - if (openViews != null && openViews.length > 0) {
578   - angular.forEach(openViews, function (value, key) {
579   -
580   - if (value.body - views == tittle) {
581   - tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
582   - $rootScope.currentActiveViewTitle = tittle;
583   - localStorage.setItem("currentViewTitle", tittle);
584   - }
585   -
586   - });
587   - }
588   - else {
589   - localStorage.setItem("currentViewTitle", tittle);
590   -
591   - }
592   -=======
593 549  
594 550 //once you get id in scope push detail in jspanel content
595 551  
... ... @@ -632,7 +588,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
632 588 // localStorage.setItem("currentViewTitle", tittle);
633 589  
634 590 //}
635   ->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
636 591  
637 592 //alert($rootScope.getLocalStorageValue("currentViewTitle"));
638 593  
... ... @@ -804,8 +759,4 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
804 759  
805 760  
806 761 }]
807   -);
808   -
809   -
810   -
811   -
  762 +);
812 763 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
  View file @6570266
... ... @@ -4,12 +4,9 @@
4 4 <div id="siteloader" class="col-sm-12">
5 5 <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
6 6 <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object>
7   -<<<<<<< HEAD
8   -=======
9 7 <iframe style="width:100%;display:none" id="externalLinkiframe" ng-style="myObj" src=""></iframe>
10 8  
11 9  
12   ->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
13 10 </div>
14 11 </div>
15 12 </div>
... ... @@ -35,6 +32,4 @@
35 32 }, false);
36 33 });
37 34  
38   -</script>
39   -
40   -
  35 +</script>
41 36 \ No newline at end of file
... ...
400-SOURCECODE/Admin/dist/index.html
  View file @6570266
1   -<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><title>A.D.A.M. Interactive Anatomy</title><link href="../assets/styles/bootstrap.css" rel="stylesheet"><link href="../assets/styles/main.css" rel="stylesheet"><link href="../assets/styles/admin-custom.css" rel="stylesheet"><link href="../assets/styles/angular-custom.css" rel="stylesheet"><link href="../assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet"><link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css"/><link href="assets/styles/fixed_table_rc.css" type="text/css" rel="stylesheet" media="all"/><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --><!-- WARNING: Respond.js doesn't work if you view the page via file:// --><!--[if lt IE 9]>
  1 +<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><title>A.D.A.M. Interactive Anatomy</title><link href="assets/styles/bootstrap.css" rel="stylesheet"><link href="assets/styles/main.css" rel="stylesheet"><link href="assets/styles/admin-custom.css" rel="stylesheet"><link href="assets/styles/angular-custom.css" rel="stylesheet"><link href="assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet"><link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css"/><link href="assets/styles/fixed_table_rc.css" type="text/css" rel="stylesheet" media="all"/><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --><!-- WARNING: Respond.js doesn't work if you view the page via file:// --><!--[if lt IE 9]>
2 2 <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
3 3 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
4   - <![endif]--><link href="styles.d41d8cd98f00b204e980.bundle.css" rel="stylesheet"/></head><body><div class="container-fluid"><app-component></app-component></div><script src="../assets/scripts/jquery-1.11.3.min.js"></script><script src="../assets/scripts/bootstrap.js"></script><script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script><script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script><script src="../assets/scripts/fixed_table_rc.js" type="text/javascript"></script><!--Nav--><script>$(function () {
  4 + <![endif]--><link href="styles.d41d8cd98f00b204e980.bundle.css" rel="stylesheet"/></head><body><div class="container-fluid"><app-component></app-component></div><script src="assets/scripts/jquery-1.11.3.min.js"></script><script src="assets/scripts/bootstrap.js"></script><script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script><script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script><script src="assets/scripts/fixed_table_rc.js" type="text/javascript"></script><!--Nav--><script>$(function () {
5 5 $("#slider-range-min-2").slider({
6 6 range: "min",
7 7 min: 1,
... ...