Commit Graph
7 Commits
Author SHA1 Message Date
Vladimir Krasnov c7513d3651 * MasterPage.cs: fixed default values, fixed AddContentTemplate
svn path=/trunk/mcs/; revision=63171
2006-07-31 11:29:43 +00:00
Chris Toshok b6274ae5d5 2006-03-13 Chris Toshok <[email protected]>
* UserControl.cs: rework InitializeAsUserControl and
	InitializeAsUserControlInternal - the Internal variety doesn't set
	this.page to null now.

	* MasterPage.cs (CreateMasterPage): map the masterPageFile path,
	and also remove a line of spew.


svn path=/trunk/mcs/; revision=57909
2006-03-13 21:27:00 +00:00
Chris Toshok b5cb597758 2006-02-07 Chris Toshok <[email protected]>
* MasterPage.cs (CreateMasterPage): don't nullref on null
	contentTemplateCollection.

	* ControlBuilder.cs: add a flushOutputStatements field.

	* PageParser.cs (ProcessMainAttributes): handle Title attribute.
	(Title): add getter.
	
	* Page.cs (Title): implement getter/setter.
	(InternalProcessRequest): after calling ApplyMasterPage, apply the
	page's Title directive if there is one.
	(AddContentTemplate): make the EditorBrowsable attribute apply to
	the method, not the field.


svn path=/trunk/mcs/; revision=56634
2006-02-07 20:04:15 +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
Chris Toshok f958ab101c 2006-01-27 Chris Toshok <[email protected]>
* MasterPage.cs (ContentTemplatesInternal): add get/set for the
	actual Hashtable.

	* Page.cs (SaveExistingContentTemplates): store off the existing
	MasterPage content templates so they can be reapplied when setting
	MasterPageFile to something else.
	(ReapplyExistingContentTemplates): set masterPage's
	ContentTemplates to our saved copy.
	(set_MasterPageFile): save off the current content templates
	before clearing masterPage.
	(get_Master): reapply the saved content templates after we create
	the new MasterPage.


svn path=/trunk/mcs/; revision=56185
2006-01-27 19:36:29 +00:00
Lluis Sanchez d2c9dd8b5a 2005-06-13 Lluis Sanchez Gual <[email protected]>
* MasterPage.cs: Clear the default content of placeholders before
	adding the page content. Fixes bug #75193.


svn path=/trunk/mcs/; revision=45886
2005-06-13 17:16:14 +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