diff --git a/test/2.0/Makefile.am b/test/2.0/Makefile.am index c230322..dfd4a62 100644 --- a/test/2.0/Makefile.am +++ b/test/2.0/Makefile.am @@ -1 +1 @@ -SUBDIRS = menu treeview +SUBDIRS = menu treeview masterpages diff --git a/test/2.0/masterpages/Makefile.am b/test/2.0/masterpages/Makefile.am new file mode 100644 index 0000000..6024699 --- /dev/null +++ b/test/2.0/masterpages/Makefile.am @@ -0,0 +1,9 @@ +samplesdir = $(datadir)/doc/xsp/test/2.0/masterpages +samples_DATA = \ + simple.master \ + simple.aspx \ + frame.master \ + content1.aspx \ + content2.aspx + +EXTRA_DIST = $(samples_DATA) diff --git a/test/2.0/masterpages/content1.aspx b/test/2.0/masterpages/content1.aspx new file mode 100644 index 0000000..82c667b --- /dev/null +++ b/test/2.0/masterpages/content1.aspx @@ -0,0 +1,12 @@ +<%@ Page Language="C#" MasterPageFile="frame.master" %> + + +Welcome to Master Pages! + + + +

This is the content of the master page file.

+

This sample master page has two placeholders, +one for the content and one for the title.

+

Click here to see another content page.

+ diff --git a/test/2.0/masterpages/content2.aspx b/test/2.0/masterpages/content2.aspx new file mode 100644 index 0000000..91b9edb --- /dev/null +++ b/test/2.0/masterpages/content2.aspx @@ -0,0 +1,10 @@ +<%@ Page Language="C#" MasterPageFile="frame.master" %> + + +Welcome again! + + + +

This is another content page for the same master page file.

+

Click here to see another content page.

+ diff --git a/test/2.0/masterpages/frame.master b/test/2.0/masterpages/frame.master new file mode 100644 index 0000000..cde8b42 --- /dev/null +++ b/test/2.0/masterpages/frame.master @@ -0,0 +1,23 @@ +<%@ Master Language="C#"%> + + + + + + Simple Master Page + + +
+ + + + + + +
+ +
+ This a common page footer. +
+ + diff --git a/test/2.0/masterpages/simple.aspx b/test/2.0/masterpages/simple.aspx new file mode 100644 index 0000000..5cdf102 --- /dev/null +++ b/test/2.0/masterpages/simple.aspx @@ -0,0 +1,5 @@ +<%@ Page Language="C#" MasterPageFile="simple.master" %> + + +Contents go here + diff --git a/test/2.0/masterpages/simple.master b/test/2.0/masterpages/simple.master new file mode 100644 index 0000000..0d0843b --- /dev/null +++ b/test/2.0/masterpages/simple.master @@ -0,0 +1,19 @@ +<%@ Master Language="C#"%> + + + + + + Simple Master Page + + +
+
+ What's inside the following box is a placeholder: +
+ +
+ That's all! + + + diff --git a/test/2.0/menu/menu1.aspx b/test/2.0/menu/menu1.aspx index 61b16c4..d288ecb 100644 --- a/test/2.0/menu/menu1.aspx +++ b/test/2.0/menu/menu1.aspx @@ -1,18 +1,11 @@ <%@ Page Language="c#" %> @@ -21,9 +14,10 @@ Simple Menu - +
- + + + + +
- - Item: <%# ((MenuItem)Container.DataItem).Text %> - + + @@ -61,9 +60,14 @@ - -

 

- + 		+

+ This is a vertical menu sample +

+