opensourceautomation
diff --git a/‎UI/Web/mobile/MobileMasterPage.master‎
Lines changed: 14 additions & 15 deletions b/‎UI/Web/mobile/MobileMasterPage.master‎
Lines changed: 14 additions & 15 deletions
diff --git a/‎UI/Web/mobile/MobileMasterPage.master.cs‎
Lines changed: 19 additions & 0 deletions b/‎UI/Web/mobile/MobileMasterPage.master.cs‎
Lines changed: 19 additions & 0 deletions
@@ -2,26 +2,25 @@
 
 <!DOCTYPE html>
 
-<html>        
-  <head>        
-    <title>OSA Web Gui
-    </title>        
+       
+<head runat="server">      
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>         
+    <title>OSA Web Gui</title>        
     <link rel="stylesheet"  href="jquery/jquery.mobile-1.3.1.min.css" />        
     <script src="jquery/jquery-1.7.2.min.js"></script>        
     <script src="jquery/jquery.mobile-1.3.1.min.js"></script>        
     <link rel="shortcut icon" href="favicon.ico"/>        
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>        
+    
     <meta content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport"/>        
     <meta content="telephone=no" name="format-detection"/>        
     <meta content="address=no" name="format-detection"/>    
-  </head>
-<body>
-    <form id="form1" runat="server">
-    <div>
-        <asp:ContentPlaceHolder id="ContentPlaceHolder" runat="server">
-        
-        </asp:ContentPlaceHolder>
-    </div>
-    </form>
-</body>
+</head>
+<html> 
+    <body>
+        <form id="form1" runat="server">
+            <asp:ScriptManager ID="ScriptManager1" runat="server" EnablePageMethods="true"></asp:ScriptManager>
+                <asp:ContentPlaceHolder id="ContentPlaceHolder" runat="server">
+                </asp:ContentPlaceHolder>
+        </form>
+    </body>
 </html>
@@ -4,11 +4,30 @@
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using System.ServiceProcess;
 
 public partial class mobile_MobileMasterPage : System.Web.UI.MasterPage
 {
+    public OSAE.General.OSAELog Log = new OSAE.General.OSAELog("Web Server");
+
     protected void Page_Load(object sender, EventArgs e)
     {
+        //SetSessionTimeout();
+    }
 
+    private void SetSessionTimeout()
+    {
+        try
+        {
+            int timeout = 0;
+            if (int.TryParse(OSAE.OSAEObjectPropertyManager.GetObjectPropertyValue("Web Server", "Timeout").Value, out timeout))
+                Session.Timeout = timeout;
+            else Session.Timeout = 60;
+        }
+        catch (Exception ex)
+        {
+            Log.Error("Error setting session timeout", ex);
+            Response.Redirect("~/error.aspx");
+        }
     }
 }