ADAM / AIAHTML5

Commit 1096aae34a55e06862052e1ab0974313c89887bd

Authored by Nikita Kulshreshtha
2 parents 11e8e1e0 b8364a4b

manually merged yearupdateissue(Merge Request #845)

Inline Side-by-side
Showing 4 changed files with 7 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @1096aae
... ... @@ -39,7 +39,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
39 39 ethnicity: null,
40 40 modesty: null
41 41 };
42   -
  42 + $rootScope.current_year = AIAConstants.current_year;
43 43 // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed.
44 44 $rootScope.refreshcheck = null;
45 45 $rootScope.isCloseSettingClicked = false;
... ... @@ -5005,6 +5005,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
5005 5005 $("#canvas").css("display", "none");
5006 5006  
5007 5007 }
  5008 + $(".currentyear").html($rootScope.current_year);
5008 5009 }, 520);
5009 5010 }
5010 5011 else {
... ... @@ -5024,6 +5025,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
5024 5025 $("#canvasPaint").css("display", "none");
5025 5026 $("#canvas").css("display", "none");
5026 5027 }
  5028 + $(".currentyear").html($rootScope.current_year);
5027 5029 }, 320);
5028 5030 }
5029 5031  
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @1096aae
... ... @@ -496,6 +496,7 @@ AIA.constant("UserModules", [
496 496 AIA.constant("AIAConstants", {
497 497 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
498 498 "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.",
  499 + "current_year": 2018,
499 500 })
500 501  
501 502  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Home/printPreview.html
  View file @1096aae
... ... @@ -47,7 +47,7 @@
47 47 </div>
48 48 <div>
49 49 <div class="pp-col-sm-4" style="position: absolute; bottom: 20px;">
50   - <span class="pull-left pp-marginTop10 font12 span-font" id="spPorCopyright">Copyright 2016 A.D.A.M., Inc. All Rights Reserved</span>
  50 + <span class="pull-left pp-marginTop10 font12 span-font" id="spPorCopyright">Copyright <span class="currentyear"></span> A.D.A.M., Inc. All Rights Reserved</span>
51 51 </div>
52 52 <div class="pp-col-sm-4" style="position: absolute; bottom: 20px; right: 10px;">
53 53 <span class="pull-right pp-marginTop10 bgnone no-margin" id="spPorLogo">
... ... @@ -72,7 +72,7 @@
72 72 </div>
73 73 <div class="print-footer-land">
74 74 <div class="pp-col-sm-4" style="position: absolute; bottom: 20px; left: 10px;">
75   - <span class="pull-left pp-marginTop10 font12 span-font" id="spLanCopyright">Copyright 2016 A.D.A.M., Inc. All Rights Reserved</span>
  75 + <span class="pull-left pp-marginTop10 font12 span-font" id="spLanCopyright">Copyright <span class="currentyear"></span> A.D.A.M., Inc. All Rights Reserved</span>
76 76 </div>
77 77 <div class="pp-col-sm-4" style="position: absolute; bottom: 20px; right: 10px;">
78 78 <span class="pull-right pp-marginTop10 bgnone no-margin" id="spLanLogo">
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @1096aae
... ... @@ -1093,7 +1093,7 @@
1093 1093 </div>
1094 1094 <div>
1095 1095 <div class="print-col-sm-4" style="position: absolute; bottom: 20px;">
1096   - <span class="pull-left marginTop10 font12 print-span-font">Copyright 2016 A.D.A.M., Inc. All Rights Reserved</span>
  1096 + <span class="pull-left marginTop10 font12 print-span-font">Copyright {{current_year}} A.D.A.M., Inc. All Rights Reserved</span>
1097 1097 </div>
1098 1098 <div class="print-col-sm-4" style="position: absolute; bottom: 20px; right: 10px;">
1099 1099 <span class="pull-right print-marginTop10 bgnone no-margin">
... ...