Attachment 57527 Details for Bug 129098 – Phoenix enable about and development pages - This time as patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Phoenix enable about and development pages - This time as patch

WTPPhoenixPatch4.txt (text/plain), 14.41 KB, created by Bob Fraser

on 2007-01-25 12:01:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Fraser

Created: 2007-01-25 12:01:04 EST

Size: 14.41 KB

patch

obsolete

>Index: _projectCommon.php
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/webtools/_projectCommon.php,v
>retrieving revision 1.7
>diff -u -r1.7 _projectCommon.php
>--- _projectCommon.php	17 Jan 2007 18:29:00 -0000	1.7
>+++ _projectCommon.php	25 Jan 2007 16:50:38 -0000
>@@ -33,12 +33,13 @@
> 	$Nav->addCustomNav("Milestone Specific Resources", 	"/webtools/community/milestonespecificresources.html", 		"_self", 2);
> 	#$Nav->addCustomNav("Installation", 		"install.php", 		"_self", 1);
> 	$Nav->addCustomNav("Adopters", 		"/webtools/adopters/main.php", 		"_self", 1);
>-	$Nav->addCustomNav("Development", 		"/webtools/development/main.html", 		"_self", 1);
>+	$Nav->addCustomNav("Development", 		"/webtools/development/main.php", 		"_self", 1);
> 	#$Nav->addCustomNav("Help Wanted", 		"plans/1.5/reports/help-wanted.html", 		"_self", 2);
>+	$Nav->addCustomNav("Project Wiki", 		"http://wiki.eclipse.org/index.php/Web_Tools_Project", 		"_self", 2);
> 	$Nav->addCustomNav("Bug Reports", 		"/webtools/development/bugs/bugs.php", 		"_self", 2);
> 	$Nav->addCustomNav("CVS", 		"http://dev.eclipse.org/viewcvs/index.cgi/?cvsroot=WebTools_Project", 		"_self", 2);
> 	$Nav->addCustomNav("Status Telecons", 		"/webtools/development/status-telecons/main.php", 		"_self", 2);
>-	$Nav->addCustomNav("Documents", 		"/webtools/development/main.html", 		"_self", 2);
>+	$Nav->addCustomNav("Documents", 		"/webtools/development/main.php", 		"_self", 2);
> 	$Nav->addCustomNav("Committers/Contributors", 		"/webtools/people/contributors.html", 		"_self", 2);
> 	$Nav->addCustomNav("FAQ", 				"/webtools/faq/main.html", 			"_self", 1);
> 	$Nav->addCustomNav("Newsgroup", 	"/newsgroups/main.html#wtp", 		"_self", 1);
>Index: main.php
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/webtools/main.php,v
>retrieving revision 1.3
>diff -u -r1.3 main.php
>--- main.php	17 Jan 2007 18:29:00 -0000	1.3
>+++ main.php	25 Jan 2007 16:50:38 -0000
>@@ -105,7 +105,7 @@
> 					<td>
> 					<p>
> 					$wtpoverview
>-					<br /> <a href="about.html">more about wtp &raquo;</a>
>+					<br /> <a href="about.php">more about wtp &raquo;</a>
>  					</p>
> 					</td>
> 					<td>
>Index: wtpphoenix.xsl
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/webtools/wtpphoenix.xsl,v
>retrieving revision 1.1
>diff -u -r1.1 wtpphoenix.xsl
>--- wtpphoenix.xsl	11 Jan 2007 13:13:18 -0000	1.1
>+++ wtpphoenix.xsl	25 Jan 2007 16:50:38 -0000
>@@ -14,8 +14,9 @@
> 					<h1>
> 						<xsl:value-of select="." />
> 					</h1>
>-					<br />
>-					<xsl:value-of select="/html/head/title" />
>+					<div class="wtpsubtitle">
>+						<xsl:value-of select="/html/head/title" />
>+					</div>
> 				</td>
> 				<td>
> 					<img src="/webtools/images/wtplogosmall.jpg"
>Index: wtpphoenix.css
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/webtools/wtpphoenix.css,v
>retrieving revision 1.1
>diff -u -r1.1 wtpphoenix.css
>--- wtpphoenix.css	11 Jan 2007 13:13:18 -0000	1.1
>+++ wtpphoenix.css	25 Jan 2007 16:50:38 -0000
>@@ -20,3 +20,8 @@
> 	margin-left: 20px;
> 	padding: 0px;
> }
>+
>+div.wtpsubtitle {
>+	color: #336;
>+	font-weight: bold;
>+}
>Index: wtpphoenixpage.xsl
>===================================================================
>RCS file: wtpphoenixpage.xsl
>diff -N wtpphoenixpage.xsl
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ wtpphoenixpage.xsl	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,120 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>+	version="1.0">
>+
>+	<xsl:template match="/sections">
>+		<div id="maincontent">
>+			<div id="midcolumn">
>+				<table>
>+					<tr>
>+						<td width="60%">
>+							<h1>
>+								<xsl:value-of select="@title" />
>+							</h1>
>+							<div class="wtpsubtitle">
>+								<xsl:value-of select="@subtitle" />
>+							</div>
>+						</td>
>+						<td>
>+							<img src="/webtools/images/wtplogosmall.jpg"
>+								align="middle" height="129" hspace="50" width="207" />
>+						</td>
>+					</tr>
>+				</table>
>+				<xsl:apply-templates select="section[@class='main']"
>+					mode="main" />
>+			</div>
>+			<div id="rightcolumn">
>+				<xsl:apply-templates select="section[@class='infobox']"
>+					mode="infobox" />
>+			</div>
>+		</div>
>+	</xsl:template>
>+
>+	<xsl:template match="section" mode="main">
>+		<div class="homeitem3col">
>+			<h3>
>+				<xsl:value-of select="@name" />
>+			</h3>
>+			<xsl:apply-templates select="description" mode="body" />
>+			<ul>
>+				<xsl:apply-templates />
>+			</ul>
>+		</div>
>+	</xsl:template>
>+
>+	<xsl:template match="section" mode="infobox">
>+		<div class="sideitem">
>+			<h6>
>+				<xsl:value-of select="@name" />
>+			</h6>
>+			<xsl:apply-templates select="description" mode="body" />
>+			<ul>
>+				<xsl:apply-templates />
>+			</ul>
>+		</div>
>+	</xsl:template>
>+
>+	<xsl:template match="section">
>+		<li>
>+			<xsl:if test="@name and @link">
>+				<a>
>+					<xsl:attribute name="href">
>+						<xsl:value-of select="@link" />
>+					</xsl:attribute>
>+					<xsl:value-of select="@name" />
>+				</a>
>+				<br />
>+			</xsl:if>
>+			<xsl:apply-templates mode="body" />
>+		</li>
>+	</xsl:template>
>+
>+	<xsl:template match="item">
>+		<xsl:choose>
>+			<xsl:when test="@link and @title">
>+				<li>
>+					<a>
>+						<xsl:attribute name="href">
>+							<xsl:value-of select="@link" />
>+						</xsl:attribute>
>+						<xsl:value-of select="@title" />
>+					</a>
>+					<xsl:if test="*|text()">
>+						<br />
>+						<xsl:apply-templates mode="body" />
>+					</xsl:if>
>+				</li>
>+			</xsl:when>
>+			<xsl:otherwise>
>+				<xsl:if test="@title">
>+					<br />
>+					<b>
>+						<xsl:value-of select="@title" />
>+					</b>
>+				</xsl:if>
>+				<xsl:if test="*|text()">
>+					<li>
>+						<xsl:apply-templates mode="body" />
>+					</li>
>+				</xsl:if>
>+			</xsl:otherwise>
>+		</xsl:choose>
>+	</xsl:template>
>+
>+	<xsl:template match="description" mode="body">
>+		<p>
>+			<xsl:apply-templates mode="body" />
>+		</p>
>+	</xsl:template>
>+
>+	<xsl:template match="*|@*|text()" mode="body">
>+		<xsl:copy>
>+			<xsl:apply-templates select="*|@*|text()" mode="body" />
>+		</xsl:copy>
>+	</xsl:template>
>+
>+	<xsl:template match="*|@*|text()" />
>+
>+</xsl:stylesheet>
>Index: development/main.php
>===================================================================
>RCS file: development/main.php
>diff -N development/main.php
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ development/main.php	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
>+$pageKeywords	= "";
>+$pageAuthor		= "Bob Fraser";
>+
>+$root = $_SERVER['DOCUMENT_ROOT'];
>+require_once ($root . '/webtools/common.php');
>+
>+# Generate the web page
>+// Load the XML source
>+$xml = DOMDocument::load('main.xml');
>+
>+//Set the page title
>+$xpath = new DOMXPath($xml);
>+$titleNode = $xpath->query("/sections/attribute::title")->item(0);
>+$pageTitle = ($titleNode != null) ? $titleNode->nodeValue : "eclipse.org webtools page";
>+
>+// Load the XSL source
>+$xsl = DOMDocument::load($root . '/webtools/wtpphoenixpage.xsl');
>+
>+// Configure the transformer
>+$proc = new XSLTProcessor;
>+$proc->importStyleSheet($xsl); // attach the xsl rules
>+
>+$maincontent = $proc->transformToXML($xml);
>+$html = <<<EOHTML
>+$maincontent
>+EOHTML;
>+$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
>+?>
>Index: phoenix/page.xml
>===================================================================
>RCS file: phoenix/page.xml
>diff -N phoenix/page.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ phoenix/page.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,86 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<sections title="Template for Phoenix style main page"
>+	subtitle="subtitle goes here">
>+	<section class="infobox" name="Right side infobox">
>+		<item title="title and link" link="http://www.eclipse.org/ ">
>+			Descriptive content under the link.
>+		</item>
>+		<item title="item 2" link="http://www.eclipse.org/" />
>+		<item>
>+			<a href="http://download.eclipse.org/">Item content only</a>
>+		</item>
>+	</section>
>+	<section class="infobox" name="Box two">
>+		<description>Optional description for this box</description>
>+		<item title="title and link no content"
>+			link="http://www.eclipse.org/" />
>+		<item title="Item two" link="http://www.eclipse.org/" />
>+		<item title="Title only is a subheader" />
>+		<item>
>+			<a href="http://www.eclipse.org/">href</a>
>+			and some descriptive text in the same item.
>+		</item>
>+		<item>
>+			<a href="http://www.eclipse.org/">Another</a>
>+			Item
>+		</item>
>+		<item title="Subheader 2" />
>+		<item>
>+			<a href="http://ws.apache.org/axis/">Axis</a>
>+		</item>
>+		<item>
>+			<a href="http://www.eclipse.org/">Eclipse</a>
>+		</item>
>+	</section>
>+
>+	<section class="main" name="Main section one">
>+		<description>
>+			Optional description - Lorem ipsum dolor sit amet,
>+			consectetuer adipiscing elit. Etiam at ante. Phasellus non
>+			augue. Sed aliquet sagittis massa. Morbi varius nulla vel
>+			quam interdum hendrerit. Etiam vel felis. Integer ultrices
>+			tincidunt mi.
>+		</description>
>+		<section name="Name and link attributes"
>+			link="http://www.eclipse.org">
>+			Nullam convallis nunc eu purus congue lobortis. Donec eget
>+			elit et enim interdum sodales. Praesent venenatis enim ac
>+			ante. Nulla a risus. Nulla sit amet enim vel ipsum sodales
>+			iaculis. Fusce pharetra sapien vitae pede. Suspendisse
>+			potenti.
>+		</section>
>+		<section name="Duis id justo" link="http://www.eclipse.org">
>+			Vivamus
>+			<a href="http://www.eclipse.org">luctus</a>
>+			tellus in velit. Pellentesque ut
>+			<a href="http://www.eclipse.org">dui</a>
>+			. Aliquam malesuada augue vel lorem.
>+		</section>
>+		<section name="Integer in velit"
>+			link="http://www.eclipse.org">
>+			Nam dignissim. Etiam aliquet, orci sed imperdiet fermentum ,
>+			massa neque venenatis tellus, at fringilla elit massa a
>+			nisl. Integer et arcu vitae diam tincidunt interdum. Sed
>+			tristique erat sed odio. Integer vel pede vitae orci porta
>+			iaculis. Nulla diam magna, iaculis in, vestibulum vel,
>+			mollis a, mauris.
>+		</section>
>+	</section>
>+	<section class="main" name="Section two">
>+		<section>
>+			<a href="www.eclipse.org/">Eclipse</a>
>+			- section with no title or link attribute just html content
>+			including an html link.
>+		</section>
>+		<section>
>+			Just content, no link. Pellentesque cursus est a magna.
>+			Aenean bibendum magna sit amet enim. Donec accumsan. Duis a
>+			urna. Aliquam vel diam eget nulla tempor viverra. Aliquam
>+			lobortis, pede ut dapibus scelerisque, sem leo auctor erat,
>+			eu malesuada magna magna et dolor. Donec lorem. Morbi
>+			vulputate tellus eget ligula. Aliquam quis felis quis massa
>+			faucibus dapibus. Quisque a arcu. Nullam est sem, adipiscing
>+			vitae, interdum sed, accumsan ut, elit. In sed neque.
>+		</section>
>+	</section>
>+</sections>
>Index: phoenix/page.php
>===================================================================
>RCS file: phoenix/page.php
>diff -N phoenix/page.php
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ phoenix/page.php	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
>+$pageKeywords	= "";
>+$pageAuthor		= "Bob Fraser";
>+
>+$root = $_SERVER['DOCUMENT_ROOT'];
>+require_once ($root . '/webtools/common.php');
>+
>+# Generate the web page
>+// Load the XML source
>+$xml = DOMDocument::load('page.xml');
>+
>+//Set the page title
>+$xpath = new DOMXPath($xml);
>+$titleNode = $xpath->query("/sections/attribute::title")->item(0);
>+$pageTitle = ($titleNode != null) ? $titleNode->nodeValue : "eclipse.org webtools page";
>+
>+// Load the XSL source
>+$xsl = DOMDocument::load($root . '/webtools/wtpphoenixpage.xsl');
>+
>+// Configure the transformer
>+$proc = new XSLTProcessor;
>+$proc->importStyleSheet($xsl); // attach the xsl rules
>+
>+$maincontent = $proc->transformToXML($xml);
>+$html = <<<EOHTML
>+$maincontent
>+EOHTML;
>+$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
>+?>
>Index: about.php
>===================================================================
>RCS file: about.php
>diff -N about.php
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ about.php	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
>+$pageKeywords	= "";
>+$pageAuthor		= "Bob Fraser";
>+
>+$root = $_SERVER['DOCUMENT_ROOT'];
>+require_once ($root . '/webtools/common.php');
>+
>+# Generate the web page
>+// Load the XML source
>+$xml = DOMDocument::load('about.xml');
>+
>+//Set the page title
>+$xpath = new DOMXPath($xml);
>+$titleNode = $xpath->query("/sections/attribute::title")->item(0);
>+$pageTitle = ($titleNode != null) ? $titleNode->nodeValue : "eclipse.org webtools page";
>+
>+// Load the XSL source
>+$xsl = DOMDocument::load($root . '/webtools/wtpphoenixpage.xsl');
>+
>+// Configure the transformer
>+$proc = new XSLTProcessor;
>+$proc->importStyleSheet($xsl); // attach the xsl rules
>+
>+$maincontent = $proc->transformToXML($xml);
>+$html = <<<EOHTML
>+$maincontent
>+EOHTML;
>+$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
>+?>

Actions: View | Diff

Attachments on bug 129098: 56731 | 56739 | 56792 | 56810 | 56844 | 57526 | 57527 | 58615 | 58813 | 58880 | 58906