Merge branch 'AIABugFixes' into AIA_Develop

Birendra
2 parents e8bd0ac6 24f9a93e
Showing 17 changed files with 436 additions and 275 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetUsersList_Result.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/index.aspx
400-SOURCECODE/AIAHTML5.Web/libs/clipboard.min.js
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
@@ -4350,6 +4350,7 @@
           <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
           <Property Type="Boolean" Name="LoginStatus" Nullable="true" />
           <Property Type="String" Name="TotalLogin" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="7" />
         </ComplexType>
         <ComplexType Name="usp_GetUserTyeByAccountNumber_Result">
           <Property Type="Byte" Name="Id" Nullable="true" />
@@ -6323,6 +6324,7 @@
                 <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
                 <ScalarProperty Name="LoginStatus" ColumnName="LoginStatus" />
                 <ScalarProperty Name="TotalLogin" ColumnName="TotalLogin" />
+                <ScalarProperty Name="LicenseStatus" ColumnName="LicenseStatus" />
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
@@ -31,5 +31,6 @@ namespace AIAHTML5.ADMIN.API.Entity
         public Nullable<int> EditionTypeId { get; set; }
         public Nullable<bool> LoginStatus { get; set; }
         public string TotalLogin { get; set; }
+        public string LicenseStatus { get; set; }
     }
 }
@@ -518,38 +518,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $timeout(function () {
                  $scope.EnableUI();
-                 $scope.ResetGridListLength();
+                 $rootScope.ResetGridListLength();
                  }, 500);
     }
-    $scope.ResetGridListLength=function()
+    $rootScope.ResetGridListLength=function()
     {
         var $ua = navigator.userAgent;
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-            if(screen.height<=768)
-            {
-                $('#grid-view').css({"height":"505","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"260","overflow":"scroll"});
-            }
-            else if(screen.height<=1024)
-            {
-                $('#grid-view').css({"height":"720","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
-            }
-            else
-            {
-                $('#grid-view').css({"height":"950","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"850","overflow":"scroll"});
-            }               
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-132;
+            var listheight=screen.height-srchHeight-356;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});               
         }
         else
         {
-            $('#grid-view').css({"height":"670","overflow":"scroll"});
-            $('#ListViewDiv').css({"height":"450","overflow":"scroll"});
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-281;
+            var listheight=screen.height-srchHeight-504;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
         }
     }
     $scope.IsVisible = function () {
@@ -789,7 +782,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $timeout(function () { 
             $scope.EnableUI(); 
-            $scope.ResetGridListLength();
+            $rootScope.ResetGridListLength();
         }, 500);
     }
@@ -933,7 +926,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $timeout(function () { 
             $scope.EnableUI();
-            $scope.ResetGridListLength();
+            $rootScope.ResetGridListLength();
          }, 500);
     }
@@ -233,33 +233,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $timeout(function () { 
             $scope.EnableUI();  
-            $scope.ResetGridListLength();         
+            $rootScope.ResetGridListLength();         
          }, 400);
     }
-    $scope.ResetGridListLength=function()
+    $rootScope.ResetGridListLength=function()
     {
         var $ua = navigator.userAgent;
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-            if(screen.height<=768)
-            {
-                $('#grid-view').css({"height":"660","overflow":"scroll"});           
-            }
-            else if(screen.height<=1024)
-            {
-                $('#grid-view').css({"height":"910","overflow":"scroll"});             
-            }
-            else
-            {
-                $('#grid-view').css({"height":"1250","overflow":"scroll"});
-            }               
+            var gridheight=screen.height-107;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+                       
         }
         else
         {
-            $('#grid-view').css({"height":"830","overflow":"scroll"});
+            var gridheight=screen.height-252;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+           
         }
+
     }
     $scope.openView = function ($event) {
@@ -11,6 +11,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.SelectedCAImage = [];
     $scope.SelectedCASummary = [];
     $scope.filterstring = false;
+    $scope.islinkActive = false;
     $scope.hostedServer = "https://ssl.adam.com/graphics/Multimedia/en/";
     $scope.hostedFolderId;
     $scope.idSelected;
@@ -164,7 +165,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.id!=null)
         {
             if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!="")
-            {
+            {             
                 $rootScope.isCallFromOtherModule = true;
                 $rootScope.linkToOpenCa=true; 
                 // store exist module in module service
@@ -182,33 +183,44 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                             .from(result.root.CAData)
                                             .where('_id = ' + $rootScope.siteUrlInfo.id)
                                             .select('_Title');
-         
-                   var CAlinkData = {
-                    "id": $rootScope.siteUrlInfo.id,
-                    "mType": 'CLINICAL_ANIMATIONS',
-                    "textVisible": true,
-                    "windowTitle": AnimationTitle[0]._Title,
-                    
-                };
-                ModuleService.setModuleData(CAlinkData, 0);
-                // close/remove prev panel when in minimised mode
-        
-                if($rootScope.CAWindowData!=undefined)
+               
+                if(AnimationTitle.length>0)
                 {
-                    if($rootScope.CAWindowData.length>0)
+                    var CAlinkData = {
+                        "id": $rootScope.siteUrlInfo.id,
+                        "mType": 'CLINICAL_ANIMATIONS',
+                        "textVisible": true,
+                        "maximised": true,
+                        "windowTitle": AnimationTitle[0]._Title,
+                        
+                    };
+                   
+                    ModuleService.setModuleData(CAlinkData, 0);
+                    // close/remove prev panel when in minimised mode
+            
+                    if($rootScope.CAWindowData!=undefined)
                     {
-                        for(var x=0 ;x < $rootScope.CAWindowData.length;x++){
-                            var winid=$rootScope.CAWindowData[x].multiwinid;
-                            if ($('#caImagePanel_' + winid).html() != undefined) {
-                                $('#caImagePanel_' + winid).remove();  
-                            }                        
+                        if($rootScope.CAWindowData.length>0)
+                        {
+                            for(var x=0 ;x < $rootScope.CAWindowData.length;x++){
+                                var winid=$rootScope.CAWindowData[x].multiwinid;
+                                if ($('#caImagePanel_' + winid).html() != undefined) {
+                                    $('#caImagePanel_' + winid).remove();  
+                                }                        
+                            }
+                            $rootScope.CAWindowData=[];
                         }
-                        $rootScope.CAWindowData=[];
                     }
+                   
+                    $location.url('/clinical-animations-detail');
                 }
-               
-                $location.url('/clinical-animations-detail');
-             
+                else
+                {
+                    $('#errorMessage').text("Animation course not found. Please try again!");
+                    $("#messageModal").modal('show');
+                   
+                }                          
+                        
                 },
                 function (error) {
                     $scope.EnableUI();
@@ -228,6 +240,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     };
     $scope.loadCAlist = function () {
         $rootScope.isCallFromOtherModule = undefined;
+        $('.breadcrumb').css('display','block');
+        $('.tab-content').css('display','block');
         $rootScope.MULTI_VIEW_ID += 1
         // store exist module in module service
@@ -369,31 +383,46 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')
         promise.then(
-                  function (result) {
+            function (result) {
+
+                if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
+                {
+                    $scope.islinkActive = true;
+                    var AnimationData = new jinqJs()
+                                        .from(result.root.CAData)
+                                        .orderBy([{ field: '_Title', sort: 'asc' }])
+                                        .select('_id','_BodyRegion','_BodySystem','_ImageId','_LowerSummary','_MedicalSpecialty','_Summary','_ThumbnailImage','_Title','_Video','copyLink');
-                      var AnimationData = new jinqJs()
-                                                       .from(result.root.CAData)
-                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
-                                                       .select();
+                   angular.forEach(AnimationData, function (value, key) {
-                      $scope.SetCAwindowStoreData(windowviewid, 'AnimationData', AnimationData);
+                   AnimationData[key].copyLink=$rootScope.homeURL+'?username='+$rootScope.userData.LoginId+'&accountNumber='+$rootScope.userData.LicenseInfo.AccountNumber.trim()+'&mtype=CA&id='+value._id;
-                      $scope.selectedCAListViewData = AnimationData;
+                  });
+                                                   
+                }
+                else
+                {
+                    var AnimationData = new jinqJs()
+                                        .from(result.root.CAData)
+                                        .orderBy([{ field: '_Title', sort: 'asc' }])
+                                        .select();
+                }
+                $scope.SetCAwindowStoreData(windowviewid, 'AnimationData', AnimationData);
+                $scope.selectedCAListViewData = AnimationData;
-                  },
-                  function (error) {
-                      $scope.EnableUI();
-                      // handle errors here
-                      console.log(' $scope.AnimationData = ' + error.statusText);
-                  }
-               );
+            },
+            function (error) {
+                $scope.EnableUI();
+                // handle errors here
+                console.log(' $scope.AnimationData = ' + error.statusText);
+            });
     };
     $scope.loadAllCA = function (windowviewid) {
-
+   
         $scope.selectedCAListViewData = $scope.GetCAwindowStoreData(windowviewid, 'AnimationData');
         $('#grid-view').empty();
@@ -401,12 +430,37 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         angular.forEach($scope.selectedCAListViewData, function (value, key) {
             var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
-            var $el = $('<div id="' + value._id + '"  class="col-sm-3 col-lg-2" title = "'+ value._Title + '" data-ng-click="openView($event)">'
-                + '<div class="thumbnail" ><a href="#">'
-                           + '<img class="tinyImg"  style="height:160px !important; width:100%!important" id="' + value._Title + '"  ng-src="' + imagePath + '" alt="" title="" >'
-                           + '<div class="caption" style="padding:0px"><p>'+'('+ value._id+') ' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
+            if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
+            {
+                var $el = $('<div class="col-sm-3 col-lg-2">'
+                +'<div id="' + value._id + '"   title = "'+ value._Title + '" data-ng-click="openView($event)">'
+                + '<div class="thumbnail" style="margin-bottom:0px!important;">'
+                +'<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
+                + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
+                +'</div></a></div></div>'             
+                +'<div class="thumbnail tooltipbtn" style="height:23px; padding:0px !important">'  
+                +'<button id="copybtn_' + value._id + '" data-clipboard-text="'+value.copyLink+'" onclick="copygridbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>' 
+                +'<span id="spn_' + value._id + '" class="tooltiptext"></span></div>'         
+            
+                +'</div>').appendTo('#grid-view');
+
+               $compile($el)($scope);
+            }
+            else
+            {
+                //site license and super admin section
+                //site license not has loginId and super admin not has accountNumber
+                var $el = $('<div class="col-sm-3 col-lg-2">'
+                +'<div id="' + value._id + '"   title = "'+ value._Title + '" data-ng-click="openView($event)">'
+                + '<div class="thumbnail">'
+                +'<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
+                + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
+                +'</div></a></div></div>'             
+                +'</div>').appendTo('#grid-view');
+                $compile($el)($scope);
+            }
-            $compile($el)($scope);
+           
             $(".sidebar").mCustomScrollbar({
                 autoHideScrollbar: true,
@@ -427,7 +481,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $timeout(function () { 
             $scope.EnableUI();  
-            $scope.ResetGridListLength();         
+            $rootScope.ResetGridListLength();         
          }, 400);
     }
@@ -618,22 +672,42 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 if (selectimg === true && count >= filtercount) {
-                    $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
-
-                    var $el = $('<div id="' + value._id + '"  class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
-                                + '<div class="thumbnail" ><a href="#">'
-                                        + '<img class="tinyImg"  style="height:160px !important;width:100%!important" id="' + value._Title + '"  ng-src="' + $scope.imagePath + '" alt="" title="" >'
-                                        + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
-
+                    var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
+                    if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
+                    {
+                        var $el = $('<div class="col-sm-3 col-lg-2">'
+                        +'<div id="' + value._id + '"   title = "'+ value._Title + '" data-ng-click="openView($event)">'
+                        + '<div class="thumbnail" style="margin-bottom:0px!important;">'
+                        + '<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
+                        + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
+                        +'</div></a></div></div>'             
+                        +'<div class="thumbnail tooltipbtn" style="height:23px; padding:0px !important">'  
+                        +'<button id="copybtn_' + value._id + '" data-clipboard-text="'+value.copyLink+'" onclick="copygridbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>' 
+                        +'<span id="spn_' + value._id + '" class="tooltiptext"></span></div>'         
+                    
+                        +'</div>').appendTo('#grid-view');
                     $compile($el)($scope);
+                    }
+                    else
+                    {
+                        //site license and super admin section
+                        //site license not has loginId and super admin not has accountNumber
+                        var $el = $('<div class="col-sm-3 col-lg-2">'
+                        +'<div id="' + value._id + '"   title = "'+ value._Title + '" data-ng-click="openView($event)">'
+                        + '<div class="thumbnail">'
+                        + '<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
+                        + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
+                        +'</div></a></div></div>'             
+                        +'</div>').appendTo('#grid-view');
+                        $compile($el)($scope);
+                    }
                     $(".sidebar").mCustomScrollbar({
                         autoHideScrollbar: true,
                         //theme:"rounded"
                     });
-
                     calistviewdata.push(
                                     {
                                         "_id": value._id,
@@ -667,36 +741,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $timeout(function () { 
                 $scope.EnableUI(); 
-                $scope.ResetGridListLength();
+                $rootScope.ResetGridListLength();
             }, 500);
     }
-    $scope.ResetGridListLength=function()
+    $rootScope.ResetGridListLength=function()
     {
         var $ua = navigator.userAgent;
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-            if(screen.height<=768)
-            {
-                $('#grid-view').css({"height":"535","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"290","overflow":"scroll"});
-            }
-            else if(screen.height<=1024)
-            {
-                $('#grid-view').css({"height":"780","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"530","overflow":"scroll"});
-            }
-            else
-            {
-                $('#grid-view').css({"height":"950","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
-            }               
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-128;
+            var listheight=screen.height-srchHeight-352;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});               
         }
         else
         {
-            $('#grid-view').css({"height":"696","overflow":"scroll"});
-            $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-276;
+            var listheight=screen.height-srchHeight-500;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
         }
     }
     $scope.scroll = function () {
@@ -944,13 +1011,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             if ($rootScope.isCallFromOtherModule) {
                  if($rootScope.linkToOpenCa==true)
                  {
-                    $scope.jsPanelWidth = $(window).outerWidth() - 10;
+                    $scope.jsPanelWidth = $(window).outerWidth()-30;
                     $scope.jsPanelHeight = $(window).outerHeight() - 105;
                     $scope.jsPanelLeft = 1;
-                    $scope.jsPanelTop = 70;
-                    $rootScope.siteUrlInfo.mtype=null;
-                    $rootScope.siteUrlInfo.id=null;
-    
+                    $scope.jsPanelTop = 55;
                  }
                  else
                  {
@@ -1310,12 +1374,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 function videoOnLoad(event) {
-    console.log('video loaded')
-    var scope = angular.element(document.getElementById("CAView")).scope();
-   // var len = (event.target.id).split("_").length;
-    var windowviewid = (event.target.id).split("_")[1];
     setTimeout(function()
     { 
+         var scope = angular.element(document.getElementById("CAView")).scope();
+        // var len = (event.target.id).split("_").length;
+        var windowviewid = (event.target.id).split("_")[1];
         scope.$apply(function () {
             scope.videoOnLoad(windowviewid);
         });
@@ -1332,3 +1395,72 @@ function GetTextVisibityCA(event) {
         scope.GetTextVisiblity(windowviewid, btnTextValue);
     });
 }
+
+function copygridbtnclick(event)
+{
+    var id = (event.target.id).split("_")[1];
+    
+    function setTooltip(message) {
+        
+        $('#spn_'+id).css({'visibility':'visible','margin-left':'0px','opacity':1});
+        $('#spn_'+id).text(message);
+        
+    }
+    
+    function hideTooltip() {
+      setTimeout(function() {
+        $('#spn_'+id).css({'visibility':'hidden','margin-left':'-50px','opacity':0});
+        $('#spn_'+id).text('');
+      }, 2000);
+    }
+
+    var clipboard = new ClipboardJS('#'+event.target.id);
+     
+    clipboard.on('success', function(e) {
+         setTooltip('link copied!');
+         hideTooltip();
+     
+    });
+    
+    clipboard.on('error', function(e) {
+        setTooltip('link not copied!');
+        hideTooltip();
+      
+    });
+
+}
+
+function copylistbtnclick(event)
+{
+    var id = (event.target.id).split("_")[1];
+    
+    function setTooltip(message) {
+        
+        $('#spnlist_'+id).css({'visibility':'visible','opacity':1});
+        $('#spnlist_'+id).text(message);
+        
+    }
+    
+    function hideTooltip() {
+      setTimeout(function() {
+        $('#spnlist_'+id).css({'visibility':'hidden','opacity':0});
+        $('#spnlist_'+id).text('');
+      }, 2000);
+    }
+
+    var clipboard = new ClipboardJS('#'+event.target.id);
+     
+    clipboard.on('success', function(e) {
+         setTooltip('link copied!');
+         hideTooltip();
+     
+    });
+    
+    clipboard.on('error', function(e) {
+        setTooltip('link not copied!');
+        hideTooltip();
+      
+    });
+   
+
+}
 \ No newline at end of file
@@ -396,7 +396,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $timeout(function () { 
                 $scope.EnableUI(); 
-                $scope.ResetGridListLength();
+                $rootScope.ResetGridListLength();
             }, 400);
     }
@@ -687,36 +687,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $timeout(function () { 
                 $scope.EnableUI(); 
-                $scope.ResetGridListLength();
+                $rootScope.ResetGridListLength();
                 }, 400);
     }
-    $scope.ResetGridListLength=function()
+    $rootScope.ResetGridListLength=function()
     {
         var $ua = navigator.userAgent;
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-            if(screen.height<=768)
-            {
-                $('#grid-view').css({"height":"535","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"290","overflow":"scroll"});
-            }
-            else if(screen.height<=1024)
-            {
-                $('#grid-view').css({"height":"720","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
-            }
-            else
-            {
-                $('#grid-view').css({"height":"950","overflow":"scroll"});
-                $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
-            }               
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-128;
+            var listheight=screen.height-srchHeight-352;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});               
         }
         else
         {
-            $('#grid-view').css({"height":"696","overflow":"scroll"});
-            $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-276;
+            var listheight=screen.height-srchHeight-500;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
         }
     }
@@ -649,7 +649,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $rootScope.checkRefreshButtonClick = 1;
         var date = new Date();
-        
         $rootScope.userInfo = {
             username: null,
             password: null,
@@ -727,13 +726,28 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                  //licenseId would be zero for admin/gernal admin
                                  var isadminType=loggedInUser.LicenseId==0?true:false;
-                                $scope.checkuserstatus = {
-                                    userId: userId,
-                                    tagName: loggedInUser.Id==0?'logout':'update',
-                                    SessionId:loggedInUser.SessionId,
-                                    isSiteUser:loggedInUser.isSiteUser,
-                                    isAdmin:isadminType
-                                }
+                                 if(loggedInUser.mtype!=undefined)
+                                 {
+                                    $scope.checkuserstatus = {
+                                        userId: userId,
+                                        tagName: loggedInUser.mtype.toLowerCase()=='ca'?'logout':'update',
+                                        SessionId:loggedInUser.SessionId,
+                                        isSiteUser:loggedInUser.isSiteUser,
+                                        isAdmin:isadminType
+                                    }
+                                 }
+                                 else
+                                 {
+                                    $scope.checkuserstatus = {
+                                        userId: userId,
+                                        tagName: loggedInUser.Id==0?'logout':'update',
+                                        SessionId:loggedInUser.SessionId,
+                                        isSiteUser:loggedInUser.isSiteUser,
+                                        isAdmin:isadminType
+                                    }
+
+                                 }
+                               
                                 // this case found when browser closed by user after login. after long time (after 20 min) open site again
                                 // loggedInUserDetails contain user detail so user auto login but it is logout by 
@@ -987,6 +1001,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
     }
     $rootScope.AuthenticateUser = function (userInfo) {
+        $rootScope.isCAlink=false;
         if (navigator.cookieEnabled) {
             $('#errorMessage').text("");
             if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) {
@@ -1018,6 +1033,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                         result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
                         result.aiaPingInterval=$rootScope.aiaPingInterval;
                         result.SessionId=userInfo.SessionId;
+                        if(userInfo.mtype!=undefined)
+                        {
+                            //for CA bypass login
+                            result.mtype=userInfo.mtype;
+                        }
                         //display user name
                         $rootScope.userName=result.FirstName+" "+result.LastName;
@@ -1381,12 +1401,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
     }
     $scope.RedirectToModule = function () {
-        
-        if($rootScope.siteUrlInfo.mtype!=null)
+        if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.id!=null)
         {
-            if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca')
-            {
+            if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!="")
+            {           
                 $('#clinical-animations').trigger('click');
+                $rootScope.isCAlink=true;
             }
         }  
@@ -1431,27 +1451,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                     $rootScope.siteUrlInfo.accountNumber = paramInfo[1];
                     console.log("$rootScope.siteUrlInfo.accountNumber" + $rootScope.siteUrlInfo.accountNumber);
                 }
-                
-                
-                    // if (paramInfo[0] == 'calsCredantial') {
-
-                    //     $rootScope.siteUrlInfo.calsCreds = paramInfo[1];
-                    //     console.log("$rootScope.siteUrlInfo.calsCreds" + $rootScope.siteUrlInfo.calsCreds);
-                    // }
-                    // else if (paramInfo[0] == 'username') {
-                    //     $rootScope.siteUrlInfo.username = paramInfo[1];
-                    //     console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.username);
-                    // }
-                    // else if (paramInfo[0] == 'password') {
-    
-                    //     $rootScope.siteUrlInfo.password = paramInfo[1];
-                    //     console.log("$rootScope.siteUrlInfo.password " + $rootScope.siteUrlInfo.password);
-                    // }
-                
-                //$rootScope.userInfo.username = $rootScope.siteUrlInfo.userId;
-                //$rootScope.userInfo.password = $rootScope.siteUrlInfo.password;
-               
             }
             else {
                 var paramInfo = siteInfo[i].split('=');
@@ -1485,7 +1485,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
             }
         }
         if (isCalsCredantialForSIte == "True") {
-            if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
+            if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!=null && $rootScope.siteUrlInfo.id!=""  && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
             {
                 $rootScope.LoginDisableUI();
                 var userInfo=$rootScope.userInfo;//also get session id
@@ -1508,6 +1508,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                     userInfo.username = result.LoginId;
                                     userInfo.password = result.Password;
+                                    userInfo.mtype = $rootScope.siteUrlInfo.mtype;
                                     var loggedInUser = JSON.parse($scope.currentUserDetails);
                                     if(loggedInUser!==null && loggedInUser.LoginId==result.LoginId)
                                     {
@@ -1538,7 +1539,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
             {
                 console.log(' invalid detail in bypass login');
                 $rootScope.isVisibleLogin = true;
-                $('#errorMessage').text("authentication is not allowed due to invalid details format .\nPlease pass the correct details again!");
+                $('#errorMessage').text("authentication is not allowed due to invalid details format.\nPlease pass the correct details again!");
                 $("#messageModal").modal('show');
             }
@@ -1581,6 +1582,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
     $rootScope.AuthenticateClientSiteUser = function (siteInfo) {
         $rootScope.LoginDisableUI();
+        $rootScope.isCAlink=false;
             AuthenticationService.validateClientSite(siteInfo)
              .then(
              function (result) {
@@ -2392,6 +2394,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 }
             }
+            if(($location.url()== "/tile-view-list") ||($location.url()== "/clinical-illustrations")||($location.url()== "/clinical-animations")||($location.url()== "/ADAM-images")||($location.url()== "/ADAM-on-demand")) {
+                $rootScope.ResetGridListLength();
+            }
+           
           };
@@ -3158,7 +3164,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 var modulePanel = $(document).find("div[id*='ImagePanel']");
                 if (modulePanel != undefined && modulePanel.length>0) {
                     //if only one module left
-                    if(modulePanel.length==1) $location.url('/' + slug);
+                    if(slug=='clinical-animations' && $rootScope.userData.mtype!=undefined)
+                    {
+                        if($rootScope.userData.mtype.toLowerCase()=='ca')
+                        {
+                            $rootScope.siteUrlInfo.mtype=null;
+                            $rootScope.siteUrlInfo.id=null;
+                            $rootScope.LogoutUser();
+                        }
+                       
+                    }
+                    else
+                    {
+                        if(modulePanel.length==1) $location.url('/' + slug);
+                    }
+                   
                 } 
             }
@@ -415,7 +415,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         var OpenItemImagePath = "../../../content/images/aa/images/" +OpenedTileData[3];
         $scope.SetAAwindowStoreData(windowviewid,'OpenItemImagePath',OpenItemImagePath);
         $rootScope.listArray.push({ "imageName": OpenItemImagePath, "text": moduleItemDataToBeSaved });
-        $("#viewList").append("<div class='col-xs-12 text-center' style='padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:10px;background-color:#fff;height:178px'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
+        $("#viewList").append("<div class='col-sm-12 text-center' style='padding: 0px 5px 0px 10px;' id='demoView'><div class='col-xs-12' style='padding:1px;background-color:#fff;height:178px'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:20px;bottom:10px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
     }
     $rootScope.openAAModuleItemMain = function () {
@@ -1670,7 +1670,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                  $timeout(function () {
                       $scope.EnableUI();
-                      $scope.ResetGridListLength();
+                      $rootScope.ResetGridListLength();
                      }, 500);
              },
               function (error) {
@@ -1680,34 +1680,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
              )
     }
-    $scope.ResetGridListLength=function()
+    $rootScope.ResetGridListLength=function()
     {
         var $ua = navigator.userAgent;
-                if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+        if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-                    if(screen.height<=768)
-                    {
-                        $('#ListViewDiv').css({"height":"300","overflow":"scroll"});
-                        $('#grid-view').css({"height":"535","overflow":"scroll"});
-                    }
-                    else if(screen.height<=1024)
-                    {
-                        $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
-                        $('#grid-view').css({"height":"720","overflow":"scroll"});
-                    }
-                    else
-                    {
-                        $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
-                        $('#grid-view').css({"height":"950","overflow":"scroll"});
-                    }
-                
-                }
-                else
-                {
-                    $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
-                    $('#grid-view').css({"height":"696","overflow":"scroll"});
-                }
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-128;
+            var listheight=screen.height-srchHeight-352;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});               
+        }
+        else
+        {
+            var srchHeight=$('.breadcrumb').height();
+            var gridheight=screen.height-srchHeight-276;
+            var listheight=screen.height-srchHeight-500;
+            $('#grid-view').css({"height":gridheight,"overflow":"auto"});
+            $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
+        }
     }
@@ -81,37 +81,23 @@
                             </tbody>
                         </table>
                     </div>
-                    <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
-                        <div class="row well" style="margin-bottom: 0px;">
+                    <div class="col-xs-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
+                        <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
                             <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
                                 <div class="thumbnail no-margin">
-                                    <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)" style="height:150px">
+                                    <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)" style="height:160px">
                                 </div>
                             </div>
-                            <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
-                                <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
+                            <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
+                                <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
                                     <p ng-bind-html="SelectedAISummary"></p>
                                 </div>
-                                <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)">Open</button>
+                                <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)" style="font-size: 14px;">Open</button>
                             </div>
                         </div>
                     </div>
-                    <!-- <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;">
-                        <div class="row well">
-                            <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
-                                <div class="thumbnail no-margin">
-                                    <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)">                                
-                                </div>
-                            </div>
-                            <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
-                                <p class="f11" ng-bind-html="SelectedCISummary"></p>
-                                <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)">Open</button>
-                            </div>
-                        </div>
-    
-                    </div> -->
                 </div>
             </div>
         </div>    
@@ -3,11 +3,10 @@
     <div ng-include="'app/widget/MainMenu.html'" />
     <div class="main" ng-init="loadAIModuleById(5)">
             <div class="col-sm-12 stickey-area clsstickydiv" style="padding-left:25px; width:100%">
-                <div class="breadcrumb">
+                <div class="breadcrumb" style="display:none">
                     <div class="row center-block">
                         <h5 class="text-center text-primary txt-white f15">Display Animation By</h5>
-                        <div class="col-md-2 hidden-sm hidden-xs visible-md visible-lg">&nbsp;</div>
-                        <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
+                        <div class="col-md-3 col-lg-2 col-lg-offset-1 col-sm-3 pad-lftrgt3">
                             <div class="form-group">
                                 <h6 class="text-center text-primary txt-white f11">Body Region</h6>
                                 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item">
@@ -15,7 +14,7 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
+                        <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
                             <div class="form-group">
                                 <h6 class="text-center text-primary txt-white f11">Body System</h6>
                                 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item">
@@ -23,7 +22,7 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
+                        <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
                             <div class="form-group">
                                 <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6>
                                 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item">
@@ -31,7 +30,7 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
+                        <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
                             <div class="form-group">
                                 <div class="col-xs-12" style="padding:0;">
@@ -47,14 +46,12 @@
                                     </div>
                                 </div>
-
-                                <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="row tab-content">
+                <div class="row tab-content" style="display:none">
                     <div class="customTable" role="tabpanel" class="tab-pane active" id="grid-view">
                     </div>
                     <div class="customTable"  role="tabpanel"  id="list-view">
@@ -62,61 +59,70 @@
                             <table class="table table-hover table-fixed bg-white table-txt12">
                                 <thead class="clsthead">
                                     <tr class="active" style="background:#f5f5f5;">
-                                        <th width="25%">Title</th>
+                                        <th width="20%">Title</th>
                                         <th width="25%">Region</th>
-                                        <th width="25%">System</th>
-                                        <th>Specialty</th>
+                                        <th width="20%">System</th>
+                                        <th width="25%">Specialty</th>
+                                        <th ng-if="islinkActive" width="10%"></th>
+                
                                     </tr>
                                 </thead>
                                 <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody">
                                     <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData">
-                                        <td width="25%">
-                                            ({{item._id}}) {{item._Title}}
+                                        <td width="20%">
+                                           {{item._Title}}
                                         </td>
                                         <td width="25%">
                                             {{item._BodyRegion}}
                                         </td>
-                                        <td width="25%">
+                                        <td width="20%">
                                             {{item._BodySystem}}
                                         </td>
-                                        <td>
+                                        <td width="25%">
                                             {{item._MedicalSpecialty}}
                                         </td>
+                                        <td ng-if="islinkActive" width="10%">
+                                            <div class="tooltipbtn" style="padding:0px !important"> 
+                                            <button id="copylistbtn_{{item._id}}" data-clipboard-text="{{item.copyLink}}" onclick="copylistbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>
+                                            <span id="spnlist_{{item._id}}" class="tooltiptext"></span></div>                                                
+                                        </td>
                                     </tr>
                                 </tbody>
                                 <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
                                     <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData">
-                                        <td width="25%">
-                                            ({{item._id}}) {{item._Title}}
+                                        <td width="20%">
+                                           {{item._Title}}
                                         </td>
                                         <td width="25%">
                                             {{item._BodyRegion}}
                                         </td>
-                                        <td width="25%">
+                                        <td width="20%">
                                             {{item._BodySystem}}
                                         </td>
-                                        <td>
+                                        <td width="25%">
                                             {{item._MedicalSpecialty}}
                                         </td>
+                                        <td ng-if="islinkActive" width="10%">
+                                            <div class="tooltipbtn" style="padding:0px !important"> 
+                                            <button id="copylistbtn_{{item._id}}" data-clipboard-text="{{item.copyLink}}" onclick="copylistbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>
+                                            <span id="spnlist_{{item._id}}" class="tooltiptext"></span></div> 
+                                        </td>
                                     </tr>
-                                    <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
-                                    <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td>
-                                </tr>-->
                                 </tbody>
                             </table>
                         </div>
-                        <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
-                            <div class="row well" style="margin-bottom: 0px;">
+                        <div class="col-sm-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
+                            <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
                                 <div title="{{SelectedCATitle}}" class="col-sm-3 col-lg-2 no-padding">
                                     <div class="thumbnail no-margin">
-                                        <img id="{{SelectedCAId}}" src="{{SelectedCAthumbImage}}" alt="" title="{{SelectedCATitle}}" data-ng-click="openView($event)" style="height:150px">
+                                        <img id="{{SelectedCAId}}" src="{{SelectedCAthumbImage}}" alt="" title="{{SelectedCATitle}}" data-ng-click="openView($event)" style="height:160px">
                                     </div>
                                 </div>
-                                <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
-                                    <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
+                                <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
+                                    <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
                                         <p ng-bind-html="SelectedCASummary"></p>
                                     </div>
-                                    <button id="{{SelectedCAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
+                                    <button id="{{SelectedCAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)" style="font-size: 14px;">Open</button>
                                 </div>
                             </div>
@@ -127,4 +133,38 @@
          </div>
     </div>
 </div>
+<!-- 3. Instantiate clipboard -->
+<style>
+    .tooltipbtn {
+      position: relative;
+    }
+    
+    .tooltipbtn .tooltiptext {
+      visibility: hidden;
+      width: 120px;
+      background-color: #555;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 125%;
+      left: 50%;
+      margin-left: -50px;
+      opacity: 0;
+      transition: opacity 0.3s;
+    }
+    
+    .tooltipbtn .tooltiptext::after {
+      content: "";
+      position: absolute;
+      top: 100%;
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #555 transparent transparent transparent;
+    }
+    </style>
@@ -131,18 +131,18 @@
                         </table>
                     </div>
-                    <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
-                        <div class="row well" style="margin-bottom: 0px;">
+                    <div class="col-sm-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
+                        <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
                             <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding">
                                 <div class="thumbnail no-margin">
-                                    <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)" style="height:150px">
+                                    <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)" style="height:160px">
                                 </div>
                             </div>
-                            <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
-                                <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
+                            <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
+                                <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
                                     <p ng-bind-html="SelectedCISummary"></p>
                                 </div>
-                                <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
+                                <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)" style="font-size: 14px;">Open</button>
                             </div>
                         </div>
@@ -23,7 +23,8 @@
         <div class="clearfix" style=""></div>
     </div>
     <!--Sidebar-->
-    <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
+    <!--with ng-if="!isCAlink"  toggle not working-->
+    <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide " ng-show="!isCAlink">
         <!--{{name}}-->
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
             <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="StoreModuleName(module.name);getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"></a></li>
@@ -80,7 +81,6 @@
         var bar = $('.sidebar');
         var main = $('.main');
         $('.toggleBar').click(function () {
-
             bar.toggleClass('active');
             main.toggleClass('active');
         });
 <div class="collapse navbar-collapse" id="topMenuBar" style="height:50px !important;margin-left:-15px;width:103%">
-    <ul class="nav navbar-nav" style="float:left" id="topul1">
+    <ul class="nav navbar-nav" style="float:left" id="topul1"  ng-if="!isCAlink">
         <li class="dropdown navbarDropdownItem disableFileMenu" id="fileMenuAnchor" style="float:left">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
             <ul class="dropdown-menu">
@@ -1559,8 +1559,8 @@
     <!--<script src="libs/jquery/1.11.3/jquery.min.js"></script>-->
-    <script src="libs/jquery/2.1.3/jquery.min.js"></script>
-    <script src="libs/jquery/1.11.4/jquery-ui.js"></script>
+    <script src="libs/jquery/2.1.3/jquery.min.js"></script> 
+    <script src="libs/jquery/1.11.4/jquery-ui.js"></script>   
     <script src="libs/xml2json.js"></script>
     <script src="libs/jquery/jquery_plugin/jquery.mCustomScrollbar.concat.min.js"></script>
@@ -1573,7 +1573,7 @@
     <script src="libs/angular/1.4.9/angular-idle.min.js"></script>
     <script src="content/js/custom/custom.js"></script>
     <!--Annotation Toolbar : jcanvas Library-->
-
+   
     <script src="libs/jcanvas/jcanvas.min.js?v=1.0.0"></script>
     <script src="libs/jcanvas/jcanvas.handle.min.js"></script>
@@ -1634,7 +1634,8 @@
     <script src="libs/html2canvas.js?v=1.0.0"></script>
     <script src="libs/FileSaverNew.js"></script>
     <script src="app/services/LabExerciseService.js?v=1.0.0"></script>
-    
+    <script src="libs/clipboard.min.js"></script>
+
     <script>
         $(function () {
+/*!
+ * clipboard.js v2.0.8
+ * https://clipboardjs.com/
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return o}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),c=n.n(e);function a(t){try{return document.execCommand(t)}catch(t){return}}var f=function(t){t=c()(t);return a("cut"),t};var l=function(t){var e,n,o,r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body},i="";return"string"==typeof t?(e=t,n="rtl"===document.documentElement.getAttribute("dir"),(o=document.createElement("textarea")).style.fontSize="12pt",o.style.border="0",o.style.padding="0",o.style.margin="0",o.style.position="absolute",o.style[n?"right":"left"]="-9999px",n=window.pageYOffset||document.documentElement.scrollTop,o.style.top="".concat(n,"px"),o.setAttribute("readonly",""),o.value=e,o=o,r.container.appendChild(o),i=c()(o),a("copy"),o.remove()):(i=c()(t),a("copy")),i};function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var s=function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=t.action,n=void 0===e?"copy":e,o=t.container,e=t.target,t=t.text;if("copy"!==n&&"cut"!==n)throw new Error('Invalid "action" value, use either "copy" or "cut"');if(void 0!==e){if(!e||"object"!==r(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===n&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===n&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')}return t?l(t,{container:o}):e?"cut"===n?f(e):l(e,{container:o}):void 0};function d(t){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function y(t,e){return(y=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function h(n){var o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}();return function(){var t,e=m(n);return t=o?(t=m(this).constructor,Reflect.construct(e,arguments,t)):e.apply(this,arguments),e=this,!(t=t)||"object"!==d(t)&&"function"!=typeof t?function(t){if(void 0!==t)return t;throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}(e):t}}function m(t){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function v(t,e){t="data-clipboard-".concat(t);if(e.hasAttribute(t))return e.getAttribute(t)}var o=function(){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&y(t,e)}(r,i());var t,e,n,o=h(r);function r(t,e){var n;return function(t){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}(this),(n=o.call(this)).resolveOptions(e),n.listenClick(t),n}return t=r,n=[{key:"copy",value:function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body};return l(t,e)}},{key:"cut",value:function(t){return f(t)}},{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof t?[t]:t,e=!!document.queryCommandSupported;return t.forEach(function(t){e=e&&!!document.queryCommandSupported(t)}),e}}],(e=[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=u()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget,t=s({action:this.action(e),container:this.container,target:this.target(e),text:this.text(e)});this.emit(t?"success":"error",{action:this.action,text:t,trigger:e,clearSelection:function(){e&&e.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(t){return v("action",t)}},{key:"defaultTarget",value:function(t){t=v("target",t);if(t)return document.querySelector(t)}},{key:"defaultText",value:function(t){return v("text",t)}},{key:"destroy",value:function(){this.listener.destroy()}}])&&p(t.prototype,e),n&&p(t,n),r}()},828:function(t){var e;"undefined"==typeof Element||Element.prototype.matches||((e=Element.prototype).matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector),t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},438:function(t,e,n){var u=n(828);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=u(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},879:function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var f=n(879),l=n(438);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!f.string(e))throw new TypeError("Second argument must be a String");if(!f.fn(n))throw new TypeError("Third argument must be a Function");if(f.node(t))return c=e,a=n,(u=t).addEventListener(c,a),{destroy:function(){u.removeEventListener(c,a)}};if(f.nodeList(t))return o=t,r=e,i=n,Array.prototype.forEach.call(o,function(t){t.addEventListener(r,i)}),{destroy:function(){Array.prototype.forEach.call(o,function(t){t.removeEventListener(r,i)})}};if(f.string(t))return t=t,e=e,n=n,l(document.body,t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,u,c,a}},817:function(t){t.exports=function(t){var e,n="SELECT"===t.nodeName?(t.focus(),t.value):"INPUT"===t.nodeName||"TEXTAREA"===t.nodeName?((e=t.hasAttribute("readonly"))||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),e||t.removeAttribute("readonly"),t.value):(t.hasAttribute("contenteditable")&&t.focus(),n=window.getSelection(),(e=document.createRange()).selectNodeContents(t),n.removeAllRanges(),n.addRange(e),n.toString());return n}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,u=o.length;i<u;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},r={},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,{a:e}),e},o.d=function(t,e){for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o(686).default;function o(t){if(r[t])return r[t].exports;var e=r[t]={exports:{}};return n[t](e,e.exports,o),e.exports}var n,r});
 \ No newline at end of file
@@ -124,10 +124,11 @@
                       <th>Email ID</th>
                       <th>User Type</th>
                       <th>Created Date</th>
-                      <th>Last Modified Date</th>
+                      <th>Modified Date</th>
                       <th>Account Number</th>
                       <th>Product Edition</th>
-                      <th>Status</th>
+                      <th>User Status</th>
+                      <th>Lic. Status</th>
                       <th>Login Status</th>
                     </tr>
                   </thead>
@@ -154,7 +155,12 @@
                         <span *ngIf="UserEntity.UserStatus!='Active'" class="label label-default">Inactive</span>
                       </td>
                       <td>
-                        <span *ngIf="UserEntity.LoginStatus==true" class="label label-success">Logged-In (Active Session: {{UserEntity.TotalLogin}})</span>
+                        <span *ngIf="UserEntity.LicenseStatus=='Active'" class="label label-success">Active</span>
+                        <span *ngIf="UserEntity.LicenseStatus=='Expired'" class="label label-default">Expired</span>
+                        <span *ngIf="UserEntity.LicenseStatus=='null'" class="label label-default"></span>
+                      </td>
+                      <td style="padding-right: 0px;">
+                        <span *ngIf="UserEntity.LoginStatus==true" class="label label-success">Logged-In, Active Session: {{UserEntity.TotalLogin}}</span>
                         <span *ngIf="UserEntity.LoginStatus==false" class="label label-default">Logged-Out</span>
                       </td>
                     </tr>
@@ -158,21 +158,15 @@ export class UsersList implements OnInit, AfterViewChecked {
         { width: 130, align: 'Center' },
         { width: 120, align: 'Center' },
         { width: 200, align: 'Center' },
-        { width: 150, align: 'Center' },
         { width: 130, align: 'Center' },
-        { width: 140, align: 'center' },
-        { width: 150, align: 'Center' },
-        { width: 180, align: 'center' },
-        { width: 100, align: 'center' },
-        { width: 160, align: 'center' },
+        { width: 110, align: 'Center' },
+        { width: 120, align: 'center' },
+        { width: 140, align: 'Center' },
+        { width: 170, align: 'center' },
+        { width: 90, align: 'left' },
+        { width: 90, align: 'left' },
+        { width: 150, align: 'left' },
-        // { width: 80, align: 'center' },
-        // { width: 150, align: 'center' },
-        // { width: 150, align: 'center' },
-        // { width: 180, align: 'Center' },
-        // { width: 400, align: 'Center' },
-        // { width: 150, align: 'center' },
-        // { width: 110, align: 'center' },
       ],
       sort: true
     });