Merge branch 'AIA_Develop' into 'AIA_PROD'

Merging Redmine Bug#173114 from AIA_Develop to AIA_Prod This item deployed on Production today so merging. See merge request !1026

Merge branch 'AIA_Develop' into 'AIA_PROD'
Merging Redmine Bug#173114 from AIA_Develop to AIA_Prod This item deployed on Production today so merging. See merge request !1026
Hemant Saxena
2 parents 0e4f4f65 a518ec29
Showing 4 changed files with 60 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/MaintenanceTemplate.html
400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -11,6 +11,7 @@
   <appSettings>
     <add key="owin:AutomaticAppStartup" value="false" />
+	  <add key="DisplayMaintenanceMessage" value="false" />
   </appSettings>
   <system.web>
@@ -9452,7 +9452,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $rootScope.UnsaveCurriculum = true;
             $scope.SetwindowStoreData(windowviewid, 'mode', "NORMAL");
             $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true);
-            $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
+            // Redmine Bug#173114 $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
             $('#btnTranparency_' + windowviewid).removeClass("disabled");
             $('#btnTranparency_' + windowviewid).css("pointer-events", "auto");
+
+<p>
+    I am trying to Dynamically Generating the Codes for Web Application<br>
+    I Want to read <strong style="color:red">External HTML File</strong>
+</p>
 \ No newline at end of file
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="ADAM.AIA.index" %>
 <%@ OutputCache NoStore="True" Duration="1" VaryByParam='*' Location="None" %> 
+<% bool i = Convert.ToBoolean(ConfigurationManager.AppSettings["DisplayMaintenanceMessage"]); %>
+
 <!DOCTYPE html>
 <html lang="en" ng-cloak ng-app="AIA">
 <head>
@@ -51,7 +53,6 @@
             background-color: #000000!important;
         }*/
-
         #termList option:hover {
             background-color: #3399FF !important;
             color: #fff !important;
@@ -164,11 +165,13 @@
         #refreshBtn {
             color: #ffffff;
         }
+       
     </style>
     <script>
         var params = "<%=urlParams%>";
         var isCalsCredantialForSIte = "<%=isCalsCredantial%>";
+        var _isUnderMaintenance = "<%=i%>";
     </script>
 </head>
@@ -1479,7 +1482,35 @@
             </div>
         </div>
     </div>
+
+
+    <!-- Maintenance Modal -->
+    <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; 
+                                                                              position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; width:100% ;height:100%">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header btn-danger">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <span aria-hidden="true">&times;</span>
+                   
+                </button>
+                <h4 class="modal-title">Site Maintenance Alert</h4>
+            </div>
+            <div class="modal-body" id="maintenance_content" style="min-height:80px;padding:20px 20px 20px 15px">
+                <h5>Website is Under Maintenance.</h5>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger btn-simple" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
+ 
+ 
+
+
     <script>
+
         function enableDisableFillOption() {
             if (document.getElementById('fill-option').checked) {
@@ -1493,7 +1524,7 @@
                 $(".enableDisableOpacity").css({ "opacity": "1" })
                 //document.getElementById("filloption1").disabled = false;
                 document.getElementById("filloption2").disabled = false;
-               // document.getElementById("filloption1").style.cursor = "default";
+                // document.getElementById("filloption1").style.cursor = "default";
                 document.getElementById("filloption2").style.cursor = "default";
@@ -1509,9 +1540,9 @@
                 $("#editstyleTexture").css({ "pointer-events": "none" });
                 $(".enableDisableOpacity label").css({ "cursor": "default" });
                 $(".enableDisableOpacity").css({ "opacity": ".5" })
-               // document.getElementById("filloption1").disabled = true;
+                // document.getElementById("filloption1").disabled = true;
                 document.getElementById("filloption2").disabled = true;
-               // document.getElementById("filloption1").style.cursor = "default";
+                // document.getElementById("filloption1").style.cursor = "default";
                 document.getElementById("filloption2").style.cursor = "default";
@@ -1648,6 +1679,7 @@
             });
         })(jQuery);
+        
     </script>
     <script>
         $(function () {
@@ -1767,6 +1799,12 @@
         $(document).ready(function () {
             //  $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
+            if (_isUnderMaintenance === 'True') {
+                $.get("app/widget/MaintenanceTemplate.html", function (html_string) {
+                    $('#maintenance_content').html(html_string);
+                });
+                $("#maintenanceModal").modal('show');
+            }
             $('.borderColorCanvasPreview').each(function () {
                 //   $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
@@ -2078,7 +2116,7 @@
         }
     </script>
     <script>
-         if (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) {
+        if (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) {
             $(document).on("click", ".annotation-modal-header", function (e) {
@@ -2097,7 +2135,7 @@
             }).blur(function () {
                 $("#listManager").draggable('enable');
-                
+
             });
@@ -2119,16 +2157,15 @@
             }).blur(function () {
                 $("#modal-settings").draggable('enable');
             });
-           
+
         }
-                   
-            function changeWidthManager()
-            {
-                
-                angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeWidthManager();
-            }
+
+        function changeWidthManager() {
+
+            angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeWidthManager();
+        }
         function changeListManager() {
@@ -2138,13 +2175,13 @@
         function changeLanguageLmList() {
-        angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeLanguageLmList();
+            angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().changeLanguageLmList();
         }
-        
+
         //this event of button bind from da module to load more data
         function LoadMoreLm() {
-        angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().LoadMoreLm();
+            angular.element(document.querySelector('[ng-controller="HomeController"]')).scope().LoadMoreLm();
         }