Commit Graph
5 Commits
Author SHA1 Message Date
Marek Habersack 3ee2925bd9 2007-03-17 Marek Habersack <[email protected]>
* MasterPageParser.cs: remove superfluous #ifdef

	* TemplateParser.cs: use VirtualPathUtility here

svn path=/trunk/mcs/; revision=74522
2007-03-17 14:24:15 +00:00
Gonzalo Paniagua Javier 2d4d7b56a5 2006-09-21 Gonzalo Paniagua Javier <[email protected]>
* Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs:
	* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master:
	* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx:
	* System.Web.UI/MasterPageParser.cs:
	* System.Web.dll.sources:
	* System.Web.Compilation/MasterPageCompiler.cs:
	* System.Web.Compilation/AspGenerator.cs: add support for the MasterType
	directive for master pages.
	Patch by Joel Reed.


svn path=/trunk/mcs/; revision=65748
2006-09-21 04:54:12 +00:00
Chris Toshok 20ca96da5a 2006-02-07 Chris Toshok <[email protected]>
* MasterPage.cs: rework this file, adding some static methods
	gleaned from MS stack traces, and clear up the propogation of
	content templates between nested master pages.

	* Control.cs (TemplateControl): implement.

	* TemplateControl.cs: re-indent some of the code.
	(ReadStringRecource): according to msdn2, these throw
	NotSupportedException.

	* MasterPageParser.cs (HandleOption): implement.  assign our
	master page's MasterPageFile from the UserControl property.

	* UserControl.cs (InitializeAsUserControlInternal): new method
	that allows initialization without a page.

	* UserControlParser.cs (ProcessMainAttributes): for 2.0 handle
	MasterPageFile attributes, so we can have nested master pages.
	(MasterPageFile): add a 2.0 specific property.
	
	* TemplateControlParser.cs: in .net 2.0, our base class is
	BaseTemplateParser.
	(HandleOptions): be consistent and call base.HandleOptions.

	* BaseTemplateParser.cs: new (stubbed) class.

	* MasterPageControlBuilder.cs: new file, not filled in (and really
	not used either.)

	* Page.cs (InternalProcessRequest): call ApplyMasterPage.
	(SaveExistingContentTemplates): nuke.
	(ReapplyExistingContentTemplate): nuke.
	(ApplyMasterPage): if we have a master page, call
	MasterPage.ApplyMasterPageRecursive with it and add it to our
	controls.
	(set_MasterPageFile): remove call to SaveExistingContentTemplates.
	(get_Master): call MasterPage.CreateMasterPage.
	(AddContentTemplate): keep track of the page's content templates
	in a local Hashtable - they aren't our master page's content
	templates.


svn path=/trunk/mcs/; revision=56620
2006-02-07 16:49:01 +00:00
Lluis Sanchez f3846ab1a8 2005-06-13 Lluis Sanchez Gual <[email protected]>
* PageParser.cs: Added MasterType property. Get the type from the
	MasterType directive.
	* MasterPageParser.cs: Added GetCompiledMasterType method.


svn path=/trunk/mcs/; revision=45884
2005-06-13 16:55:11 +00:00
Lluis Sanchez 5064e23220 2005-01-21 Lluis Sanchez Gual <[email protected]>
* PageParser.cs: Read the MasterPageFile attribute.
	* UserControlParser.cs: Not sealed any more since we need to inherit from
	it. Added new constructor with an additional "type" parameter.
	* MasterPageParser.cs: Parser for master pages.
	* Page.cs: Added support for master pages.
	* MasterPage.cs: Implemented.


svn path=/trunk/mcs/; revision=39318
2005-01-21 18:03:15 +00:00