Merged
Merge Request #1026 · created by Hemant Saxena


Merging Redmine Bug#173114 from AIA_Develop to AIA_Prod

This item deployed on Production today so merging.


From AIA_Develop into AIA_PROD

Merged by Hemant Saxena

1 participants


400-SOURCECODE/AIAHTML5.Web/Web.config
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 11
12 <appSettings> 12 <appSettings>
13 <add key="owin:AutomaticAppStartup" value="false" /> 13 <add key="owin:AutomaticAppStartup" value="false" />
  14 + <add key="DisplayMaintenanceMessage" value="false" />
14 15
15 </appSettings> 16 </appSettings>
16 <system.web> 17 <system.web>
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -9452,7 +9452,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9452,7 +9452,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9452 $rootScope.UnsaveCurriculum = true; 9452 $rootScope.UnsaveCurriculum = true;
9453 $scope.SetwindowStoreData(windowviewid, 'mode', "NORMAL"); 9453 $scope.SetwindowStoreData(windowviewid, 'mode', "NORMAL");
9454 $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true); 9454 $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true);
9455 - $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []); 9455 + // Redmine Bug#173114 $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
9456 9456
9457 $('#btnTranparency_' + windowviewid).removeClass("disabled"); 9457 $('#btnTranparency_' + windowviewid).removeClass("disabled");
9458 $('#btnTranparency_' + windowviewid).css("pointer-events", "auto"); 9458 $('#btnTranparency_' + windowviewid).css("pointer-events", "auto");
400-SOURCECODE/AIAHTML5.Web/app/widget/MaintenanceTemplate.html 0 → 100644
  1 +
  2 +<p>
  3 + I am trying to Dynamically Generating the Codes for Web Application<br>
  4 + I Want to read <strong style="color:red">External HTML File</strong>
  5 +</p>
0 \ No newline at end of file 6 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/index.aspx
1 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="ADAM.AIA.index" %> 1 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="ADAM.AIA.index" %>
2 <%@ OutputCache NoStore="True" Duration="1" VaryByParam='*' Location="None" %> 2 <%@ OutputCache NoStore="True" Duration="1" VaryByParam='*' Location="None" %>
3 3
  4 +<% bool i = Convert.ToBoolean(ConfigurationManager.AppSettings["DisplayMaintenanceMessage"]); %>
  5 +
4 <!DOCTYPE html> 6 <!DOCTYPE html>
5 <html lang="en" ng-cloak ng-app="AIA"> 7 <html lang="en" ng-cloak ng-app="AIA">
6 <head> 8 <head>
@@ -51,7 +53,6 @@ @@ -51,7 +53,6 @@
51 background-color: #000000!important; 53 background-color: #000000!important;
52 }*/ 54 }*/
53 55
54 -  
55 #termList option:hover { 56 #termList option:hover {
56 background-color: #3399FF !important; 57 background-color: #3399FF !important;
57 color: #fff !important; 58 color: #fff !important;
@@ -164,11 +165,13 @@ @@ -164,11 +165,13 @@
164 #refreshBtn { 165 #refreshBtn {
165 color: #ffffff; 166 color: #ffffff;
166 } 167 }
  168 +
167 </style> 169 </style>
168 170
169 <script> 171 <script>
170 var params = "<%=urlParams%>"; 172 var params = "<%=urlParams%>";
171 var isCalsCredantialForSIte = "<%=isCalsCredantial%>"; 173 var isCalsCredantialForSIte = "<%=isCalsCredantial%>";
  174 + var _isUnderMaintenance = "<%=i%>";
172 </script> 175 </script>
173 176
174 </head> 177 </head>
@@ -1479,7 +1482,35 @@ @@ -1479,7 +1482,35 @@
1479 </div> 1482 </div>
1480 </div> 1483 </div>
1481 </div> 1484 </div>
  1485 +
  1486 +
  1487 + <!-- Maintenance Modal -->
  1488 + <div class="modal fade" id="maintenanceModal" ng-hide="isVisibleLogin" data-backdrop="false" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="padding-left: 17px; z-index: 1200002;
  1489 + position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; width:100% ;height:100%">
  1490 + <div class="modal-dialog">
  1491 + <div class="modal-content">
  1492 + <div class="modal-header btn-danger">
  1493 + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
  1494 + <span aria-hidden="true">&times;</span>
  1495 +
  1496 + </button>
  1497 + <h4 class="modal-title">Site Maintenance Alert</h4>
  1498 + </div>
  1499 + <div class="modal-body" id="maintenance_content" style="min-height:80px;padding:20px 20px 20px 15px">
  1500 + <h5>Website is Under Maintenance.</h5>
  1501 + </div>
  1502 + <div class="modal-footer">
  1503 + <button type="button" class="btn btn-danger btn-simple" data-dismiss="modal">Close</button>
  1504 + </div>
  1505 + </div>
  1506 + </div>
  1507 +</div>
  1508 +
  1509 +
  1510 +
  1511 +
1482 <script> 1512 <script>
  1513 +
1483 function enableDisableFillOption() { 1514 function enableDisableFillOption() {
1484 if (document.getElementById('fill-option').checked) { 1515 if (document.getElementById('fill-option').checked) {
1485 1516
@@ -1493,7 +1524,7 @@ @@ -1493,7 +1524,7 @@
1493 $(".enableDisableOpacity").css({ "opacity": "1" }) 1524 $(".enableDisableOpacity").css({ "opacity": "1" })
1494 //document.getElementById("filloption1").disabled = false; 1525 //document.getElementById("filloption1").disabled = false;
1495 document.getElementById("filloption2").disabled = false; 1526 document.getElementById("filloption2").disabled = false;
1496 - // document.getElementById("filloption1").style.cursor = "default"; 1527 + // document.getElementById("filloption1").style.cursor = "default";
1497 document.getElementById("filloption2").style.cursor = "default"; 1528 document.getElementById("filloption2").style.cursor = "default";
1498 1529
1499 1530
@@ -1509,9 +1540,9 @@ @@ -1509,9 +1540,9 @@
1509 $("#editstyleTexture").css({ "pointer-events": "none" }); 1540 $("#editstyleTexture").css({ "pointer-events": "none" });
1510 $(".enableDisableOpacity label").css({ "cursor": "default" }); 1541 $(".enableDisableOpacity label").css({ "cursor": "default" });
1511 $(".enableDisableOpacity").css({ "opacity": ".5" }) 1542 $(".enableDisableOpacity").css({ "opacity": ".5" })
1512 - // document.getElementById("filloption1").disabled = true; 1543 + // document.getElementById("filloption1").disabled = true;
1513 document.getElementById("filloption2").disabled = true; 1544 document.getElementById("filloption2").disabled = true;
1514 - // document.getElementById("filloption1").style.cursor = "default"; 1545 + // document.getElementById("filloption1").style.cursor = "default";
1515 document.getElementById("filloption2").style.cursor = "default"; 1546 document.getElementById("filloption2").style.cursor = "default";
1516 1547
1517 1548
@@ -1648,6 +1679,7 @@ @@ -1648,6 +1679,7 @@
1648 1679
1649 }); 1680 });
1650 })(jQuery); 1681 })(jQuery);
  1682 +
1651 </script> 1683 </script>
1652 <script> 1684 <script>
1653 $(function () { 1685 $(function () {
@@ -1767,6 +1799,12 @@ @@ -1767,6 +1799,12 @@
1767 $(document).ready(function () { 1799 $(document).ready(function () {
1768 // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation"); 1800 // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
1769 1801
  1802 + if (_isUnderMaintenance === 'True') {
  1803 + $.get("app/widget/MaintenanceTemplate.html", function (html_string) {
  1804 + $('#maintenance_content').html(html_string);
  1805 + });
  1806 + $("#maintenanceModal").modal('show');
  1807 + }
1770 1808
1771 $('.borderColorCanvasPreview').each(function () { 1809 $('.borderColorCanvasPreview').each(function () {
1772 // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation"); 1810 // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
@@ -2078,7 +2116,7 @@ @@ -2078,7 +2116,7 @@
2078 } 2116 }
2079 </script> 2117 </script>
2080 <script> 2118 <script>
2081 - if (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) { 2119 + if (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) {
2082 2120
2083 $(document).on("click", ".annotation-modal-header", function (e) { 2121 $(document).on("click", ".annotation-modal-header", function (e) {
2084 2122
@@ -2097,7 +2135,7 @@ @@ -2097,7 +2135,7 @@
2097 }).blur(function () { 2135 }).blur(function () {
2098 2136
2099 $("#listManager").draggable('enable'); 2137 $("#listManager").draggable('enable');
2100 - 2138 +
2101 2139
2102 }); 2140 });
2103 2141
@@ -2119,16 +2157,15 @@ @@ -2119,16 +2157,15 @@
2119 }).blur(function () { 2157 }).blur(function () {
2120 $("#modal-settings").draggable('enable'); 2158 $("#modal-settings").draggable('enable');
2121 }); 2159 });
2122 - 2160 +
2123 2161
2124 } 2162 }
2125 2163
2126 -  
2127 - function changeWidthManager()  
2128 - {  
2129 -  
2130 - angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeWidthManager();  
2131 - } 2164 +
  2165 + function changeWidthManager() {
  2166 +
  2167 + angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeWidthManager();
  2168 + }
2132 2169
2133 2170
2134 function changeListManager() { 2171 function changeListManager() {
@@ -2138,13 +2175,13 @@ @@ -2138,13 +2175,13 @@
2138 2175
2139 function changeLanguageLmList() { 2176 function changeLanguageLmList() {
2140 2177
2141 - angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeLanguageLmList(); 2178 + angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeLanguageLmList();
2142 } 2179 }
2143 - 2180 +
2144 //this event of button bind from da module to load more data 2181 //this event of button bind from da module to load more data
2145 function LoadMoreLm() { 2182 function LoadMoreLm() {
2146 2183
2147 - angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().LoadMoreLm(); 2184 + angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().LoadMoreLm();
2148 } 2185 }
2149 2186
2150 2187