Author: andrews
Date: 2006-05-11 03:11:37 -0400 (Thu, 11 May 2006)
New Revision: 60577
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Page.cs
trunk/mcs/class/System.Web/System.Web.UI/PageTheme.cs
Log:
use LinkedStyleSheets from the PageTheme and from StyleSheetPageTheme to insert
links in page header.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-05-11 07:06:43 UTC
(rev 60576)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-05-11 07:11:37 UTC
(rev 60577)
@@ -1,3 +1,8 @@
+2006-05-11 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * Page.cs, PageTheme.cs: This patch uses LinkedStyleSheets from the
+ PageTheme and from StyleSheetPageTheme to insert links in page header.
+
2006-05-10 Andrew Skiba <[EMAIL PROTECTED]>
* TemlpateParser.cs: surround file name with quotes
Modified: trunk/mcs/class/System.Web/System.Web.UI/Page.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Page.cs 2006-05-11 07:06:43 UTC
(rev 60576)
+++ trunk/mcs/class/System.Web/System.Web.UI/Page.cs 2006-05-11 07:11:37 UTC
(rev 60577)
@@ -1740,6 +1740,28 @@
return dataItemCtx.Peek ();
}
+ protected internal override void OnInit (EventArgs e)
+ {
+ base.OnInit (e);
+ if (Header == null)
+ return;
+
+ ArrayList themes = new ArrayList();
+
+ if (StyleSheetPageTheme != null)
+ themes.AddRange (StyleSheetPageTheme.GetStyleSheets ());
+ if (PageTheme != null)
+ themes.AddRange (PageTheme.GetStyleSheets ());
+
+ foreach (string lss in themes) {
+ HtmlLink hl = new HtmlLink ();
+ hl.Href = lss;
+ hl.Attributes["type"] = "text/css";
+ hl.Attributes["rel"] = "stylesheet";
+ Header.Controls.Add (hl);
+ }
+ }
+
#endif
}
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/PageTheme.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/PageTheme.cs 2006-05-11
07:06:43 UTC (rev 60576)
+++ trunk/mcs/class/System.Web/System.Web.UI/PageTheme.cs 2006-05-11
07:11:37 UTC (rev 60577)
@@ -116,6 +116,10 @@
object key = PageTheme.CreateSkinKey (controlType,
skinID);
return ControlSkins[key] as ControlSkin;
}
+
+ internal string [] GetStyleSheets () {
+ return LinkedStyleSheets;
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
