Changed 'Home' and SDSS icon links on the Tools pages to point to Sky…

…Server home page
sciserver · Feb 18, 2015 · 445abdf · 445abdf
1 parent 4067146
commit 445abdf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git 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 = "<tr>\n\t<td><span  ONMOUSEOVER=\"this.T_TEMP='3000';this.T_WIDTH='180';return escape('"+tooltip+"')\">"+label+"</span></td>\n";

diff --git 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
@@ -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</span></td></tr></table>\n\t\t</td>\n</tr>\n";
             Response.Write(s);
         }
-
+        /*
         string getURL()
         {
             string host = Request.ServerVariables["SERVER_NAME"];
@@ -80,5 +81,6 @@ string getURL()
             }
             return root;
         }
+        */
     }
 }
diff --git 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");
         }
     }
 }