[webdoc] add the api.master master file, and start wiring in subviews

author: Nina Vyedin <nina.vyedin@gmail.com> 2013-03-05 03:28:04 +0400
committer: Nina Vyedin <nina.vyedin@gmail.com> 2013-03-05 07:56:00 +0400
commit: c7fa4616ea7c89c2f53c9ebfca43e203c38c6425 (patch)
tree: e208e1660b37920cb80c982894c42f868ede8c7f /webdoc
parent: e6bd8a2d4b5b7f8725ccc9c339f1cfc28746cf8b (diff)
3 files changed, 96 insertions, 69 deletions
diff --git a/webdoc/api.master b/webdoc/api.master
new file mode 100644
index 00000000..a09fa42e
--- /dev/null
+++ b/webdoc/api.master
@@ -0,0 +1,41 @@
+<%@ Master Language="C#" %>
+<%@ Import Namespace="System.Web" %>
+<%@ Import Namespace="System.Collections.Specialized" %>
+<%@ Import Namespace="System.Web.Configuration" %>
+<%@ Import Namespace="Mono.Website" %>
+<%@ Assembly name="monodoc" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 
+    1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+
+<head runat="server" >
+    <title><% = WebConfigurationManager.AppSettings["Title"] %></title>
+    <link href="favicon.ico" type="image/png" rel="icon">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" >
+    <link type="text/css" rel="stylesheet" href="reset.css"/>
+    <link type="text/css" rel="stylesheet" href="common.css"/>
+    <% = Plugin.GetPluginContent (Plugin.PluginContent.Css) %>    
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+</head>
+
+<body>
+<form id="application_content" runat="server">
+	<% = Plugin.GetPluginContent (Plugin.PluginContent.Header) %>
+	<asp:contentplaceholder id="Main" runat="server" />
+	
+	<!--uncomment if you want to use the contrib plugin
+	<asp:contentplaceholder id="Login" runat="server" />-->
+
+	<!--uncomment if you want to use the fastsearch plugin
+	<asp:contentplaceholder id="FastSearch" runat="server" />-->
+        <% = Plugin.GetPluginContent (Plugin.PluginContent.Footer) %>
+	<% = Plugin.GetPluginContent (Plugin.PluginContent.Javascript) %>
+
+	<!--uncomment if you want to use the sidebar plugin-->
+	<asp:contentplaceholder id="TreeGenerator" runat="server" />
+</form>
+</body>
+
+</html>
+
diff --git a/webdoc/index.aspx b/webdoc/index.aspx
index 995fb5a9..fb0e422d 100644
--- a/webdoc/index.aspx
+++ b/webdoc/index.aspx
@@ -1,80 +1,67 @@
-<%@ Page Language="C#" ClassName="Mono.Website.Index" %>
-<%@ Import Namespace="System.Web" %>
-<%@ Import Namespace="System.Collections.Specialized" %>
-<%@ Import Namespace="System.Web.Configuration" %>
-<%@ Import Namespace="Mono.Website" %>
+<%@ Page Language="C#" ClassName="Mono.Website.Index" MasterPageFile="api.master" %>
 <%@ Assembly name="monodoc" %>
 
-<html>
-  <head>
-    <title><% = WebConfigurationManager.AppSettings["Title"] %></title>
-    <link href="favicon.ico" type="image/png" rel="icon">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" >
-    <link type="text/css" rel="stylesheet" href="reset.css"/>
-    <% = Plugin.GetPluginContent (Plugin.PluginContent.Css) %>    
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-  </head>
-  <body>
-  <% = Plugin.GetPluginContent (Plugin.PluginContent.Header) %>
-    <!--Do our c# scripts here to generate iframe/monodoc magic-->
-    <script language="c#" runat="server">
-	public string GetTitle ()
-	{
-		return Global.help_tree.GetTitle (Request.QueryString ["link"]);
-	}
+<asp:Content ID="Main" ContentPlaceHolderID="Main" Runat="Server">
+<script language="c#" runat="server">
+public string GetTitle ()
+{
+return Global.help_tree.GetTitle (Request.QueryString ["link"]);
+}
+// Get the path to be shown in the content frame
+string getContentFrame()
+{
+// Docs get shown from monodoc.ashx
+string monodocUrl="monodoc.ashx";
+string defaultParams="?link=root:";
+NameValueCollection qStringParams=Request.QueryString;
+
+// If no querystring params, show root link
+if(!qStringParams.HasKeys())
+return(monodocUrl+defaultParams);
+// else, build query for the content frame
+string nQueryString=monodocUrl+"?";
+	foreach(string key in qStringParams)
+	nQueryString+=(HttpUtility.UrlEncode(key)+"="+HttpUtility.UrlEncode(qStringParams[key]));
+	return nQueryString;
+}
+</script>
 
-	// Get the path to be shown in the content frame
-	string getContentFrame()
-	{
-		// Docs get shown from monodoc.ashx
-		string monodocUrl="monodoc.ashx";
-		string defaultParams="?link=root:";
-		NameValueCollection qStringParams=Request.QueryString;
+<div id="main_part">
+	<div id="side">
+		<a class="doc-sidebar-toggle shrink" href="#"></a>
+		<a class="doc-sidebar-toggle expand" href="#"></a>
+        	<div id="contents" class="activeTab">
+             		<div id="contentList"></div>
+       		</div>
+     	</div>
+	<div id="content_frame_wrapper"><iframe id="content_frame" src="<% =getContentFrame() %>"></iframe></div>        
+</div>
+</asp:Content>
 
-		// If no querystring params, show root link
-		if(!qStringParams.HasKeys())
-			return(monodocUrl+defaultParams);
-		// else, build query for the content frame
-		string nQueryString=monodocUrl+"?";
-		foreach(string key in qStringParams)
-			nQueryString+=(HttpUtility.UrlEncode(key)+"="+HttpUtility.UrlEncode(qStringParams[key]));
-		return nQueryString;
-	}
-/*
+<asp:Content ID="Login" ContentPlaceHolderID="Login" Runat="Server">
+<script language="C#" runat="server">
 void Page_Load (object sender, EventArgs e)
 {
 	if (User.Identity.IsAuthenticated){
-		login.NavigateUrl = "logout.aspx";
+		login.NavigateUrl = "plugins/contributor-plugin/logout.aspx";
 		login.Text = "Logged in as " + User.Identity.Name;
 	} else {
 		login.NavigateUrl = "javascript:parent.content.login (parent.content.window.location)";
-		login.Text = "Sign in / create account"; 
+		//login.Text = "Sign in / create account";
 	}
-}*/
-   </script>
-
-<!--HTML goes here-->
-   <!--  <div id="dlogin">
+}
+</script>
+<div id="dlogin">
        <asp:HyperLink id="login" runat="server"/>
-     </div>
+</div>
+</asp:Content>
 
-	 <div id="fsearch_companion"></div>
-     <div id="fsearch_window"></div>
-    </div>
--->
-    <div id="main_part">
-     <div id="side">
-     <a class="doc-sidebar-toggle shrink" href="#"></a>
-     <a class="doc-sidebar-toggle expand" href="#"></a>	   
-	<div id="contents" class="activeTab">
-	     <div id="contentList"></div>
-       </div>
-     </div>
-     <div id="content_frame_wrapper"><iframe id="content_frame" src="<% =getContentFrame() %>"></iframe></div>
-	</div>
-     <% = Plugin.GetPluginContent (Plugin.PluginContent.Footer) %>
-<!--include external javascript-->
-<% = Plugin.GetPluginContent (Plugin.PluginContent.Javascript) %>
+<asp:Content ID="fsearch" ContentPlaceHolderID="FastSearch" Runat="Server">
+<div id="fsearch_companion"></div>
+<div id="fsearch_window"></div>
+</asp:Content>
+    
+<asp:Content ID="Tree" ContentPlaceHolderID="TreeGenerator" Runat="Server">
 <script type="text/javascript">
         var tree = new PTree ();
         tree.strSrcBase = 'monodoc.ashx?tree=';
@@ -85,7 +72,6 @@ void Page_Load (object sender, EventArgs e)
         var content = document.getElementById ('contentList');
         var root = tree.CreateItem (null, 'Documentation List', 'root:', '', true);
         content.appendChild (root);
-	<% = Global.CreateTreeBootFragment () %>
+<% = Global.CreateTreeBootFragment () %>
 </script>
-</body>
-</html>
+</asp:Content>
diff --git a/webdoc/plugins.def b/webdoc/plugins.def
index b98cc675..6879cf3c 100644
--- a/webdoc/plugins.def
+++ b/webdoc/plugins.def
@@ -1,8 +1,8 @@
-#####DISTRIBUTION####
+#####SKIN####
 skins/xamarin-external
 
 ######PLUGINS######
 # plugins/search-plugin/fastsearch
-# plugins/search-plugin/fullsearch
+plugins/search-plugin/fullsearch
 plugins/sidebar-plugin
 # plugins/contributior-plugin
author	Nina Vyedin <nina.vyedin@gmail.com>	2013-03-05 03:28:04 +0400
committer	Nina Vyedin <nina.vyedin@gmail.com>	2013-03-05 07:56:00 +0400
commit	c7fa4616ea7c89c2f53c9ebfca43e203c38c6425 (patch)
tree	e208e1660b37920cb80c982894c42f868ede8c7f /webdoc
parent	e6bd8a2d4b5b7f8725ccc9c339f1cfc28746cf8b (diff)