diff --git a/en/tools/chart/ChartBase.Master.cs b/en/tools/chart/ChartBase.Master.cs index a9073cb..bd0e468 100644 --- a/en/tools/chart/ChartBase.Master.cs +++ b/en/tools/chart/ChartBase.Master.cs @@ -28,7 +28,8 @@ public partial class ChartBase : System.Web.UI.MasterPage protected void Page_Load(object sender, EventArgs e) { globals = (Globals)Application[Globals.PROPERTY_NAME]; - url = getURL(); + //url = getURL(); + url = ResolveUrl("~"); ra = globals.VisualRA; dec = globals.VisualDec; qscale = globals.VisualScale; @@ -48,6 +49,7 @@ protected void Page_Load(object sender, EventArgs e) } } + /* string getURL() { string host = Request.ServerVariables["SERVER_NAME"]; @@ -68,7 +70,8 @@ string getURL() } return root; } - + */ + protected void drawFormBox(string label,string name,string value,string change,string unit,string tooltip) { string s = "\n\t"+label+"\n"; diff --git a/en/tools/chart/ListBase.Master.cs b/en/tools/chart/ListBase.Master.cs index e3f343e..0307bac 100644 --- a/en/tools/chart/ListBase.Master.cs +++ b/en/tools/chart/ListBase.Master.cs @@ -58,8 +58,8 @@ public partial class ListBase : System.Web.UI.MasterPage protected void Page_Load(object sender, EventArgs e) { globals = (Globals)Application[Globals.PROPERTY_NAME]; - url = getURL(); - + //url = getURL(); + url = ResolveUrl("~"); string key; for (var i = 0; i < Request.Params.Keys.Count; i++) { @@ -73,6 +73,7 @@ protected void Page_Load(object sender, EventArgs e) } } + /* public string getURL() { string host = Request.ServerVariables["SERVER_NAME"]; @@ -93,6 +94,7 @@ public string getURL() } return root; } + */ protected void drawFormBox(string label, string name, string value, string change, string unit, string tooltip) { diff --git a/en/tools/chart/Navi.aspx.cs b/en/tools/chart/Navi.aspx.cs index 7021ce7..e62eec2 100644 --- a/en/tools/chart/Navi.aspx.cs +++ b/en/tools/chart/Navi.aspx.cs @@ -28,7 +28,8 @@ public partial class Navi : System.Web.UI.Page protected void Page_Load(object sender, EventArgs e) { globals = (Globals)Application[Globals.PROPERTY_NAME]; - url = getURL(); + //url = getURL(); + url = ResolveUrl("~"); ra = globals.VisualRA; dec = globals.VisualDec; qscale = globals.VisualScale; @@ -59,7 +60,7 @@ protected void drawFormBox(string label, string name, string value, string chang s += "\t\t\t\n\t\t\n\n"; Response.Write(s); } - + /* string getURL() { string host = Request.ServerVariables["SERVER_NAME"]; @@ -80,5 +81,6 @@ string getURL() } return root; } + */ } } \ No newline at end of file diff --git a/en/tools/chart/SqlToForm.aspx.cs b/en/tools/chart/SqlToForm.aspx.cs index b4e8c29..d82c32f 100644 --- a/en/tools/chart/SqlToForm.aspx.cs +++ b/en/tools/chart/SqlToForm.aspx.cs @@ -9,7 +9,7 @@ namespace SkyServer.Tools.Chart { public partial class SqlToForm : System.Web.UI.Page { - protected string url; + //protected string url; protected string suburl; protected string prturl; protected string query; @@ -19,11 +19,12 @@ public partial class SqlToForm : System.Web.UI.Page protected void Page_Load(object sender, EventArgs e) { master = (ListBase)Page.Master; - url = master.getURL(); + //url = master.getURL(); + suburl = "list.aspx"; prturl = "printlist.aspx"; query = "f_sql.aspx"; - caller = url + "list.aspx"; + caller = ResolveUrl("list.aspx"); } } } \ No newline at end of file