459115: update staging website to match master
commit 96a893259912937283d6bc25ed274e2ddc02302a was not on the stagig
website
Change-Id: I570476b8eba8562fb0e62018eb0b072407d4e33e
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=459115
Signed-off-by: Frank Becker <eclipse@frank-becker.de>
diff --git a/discovery/directory-3.14.xml b/discovery/directory-3.14.xml
index 65f36ba..bcd64f5 100644
--- a/discovery/directory-3.14.xml
+++ b/discovery/directory-3.14.xml
@@ -2,4 +2,4 @@
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
<entry url="https://www.eclipse.org/downloads/download.php?file=/mylyn/discovery/org.eclipse.mylyn.discovery-3.14.jar&r=1&protocol=http" permitCategories="true"/>
<entry url="http://tasktop.com/downloads/discovery/com.tasktop.discovery-3.14.jar" permitCategories="true"/>
-</directory>
+</directory>
\ No newline at end of file
diff --git a/discovery/directory-3.15.xml b/discovery/directory-3.15.xml
index 5458587..b73eb3a 100644
--- a/discovery/directory-3.15.xml
+++ b/discovery/directory-3.15.xml
@@ -3,6 +3,6 @@
<entry
url="https://www.eclipse.org/downloads/download.php?file=/mylyn/discovery/org.eclipse.mylyn.discovery-3.15.jar&r=1&protocol=http"
permitCategories="true" />
- <!-- <entry url="http://tasktop.com/downloads/discovery/com.tasktop.discovery-3.15.jar"
+ <!-- <entry url="http://tasktop.com/downloads/discovery/com.tasktop.discovery-3.15.jar"
permitCategories="true"/> -->
</directory>
\ No newline at end of file
diff --git a/downloads/archive.php b/downloads/archive.php
index ed9e11a..6d2629f 100644
--- a/downloads/archive.php
+++ b/downloads/archive.php
@@ -4,7 +4,7 @@
#
#****************************************************************************
- #
+ #
# Begin: page-specific settings. Change these.
$pageTitle = "Mylyn Download Archives";
$pageKeywords = "Mylyn, Eclipse";
@@ -18,14 +18,14 @@
# End: page-specific settings
#
-
+
# Paste your HTML content between the EOHTML markers!
-
+
include("_sideCommon.php");
include("_sideFeedback.php");
include("_sideMylarIs.php");
include("_sideSubscribe.php");
-
+
$html = <<<EOHTML
<div id="maincontent">
diff --git a/downloads/index.php b/downloads/index.php
index 94368c6..26f143e 100644
--- a/downloads/index.php
+++ b/downloads/index.php
@@ -3,13 +3,13 @@
#*****************************************************************************
#
#****************************************************************************
-
+
#
# Begin: page-specific settings. Change these.
$pageTitle = "Mylyn Downloads";
$pageKeywords = "Mylyn, Eclipse";
$pageAuthor = "Mik Kersten";
-
+
# Add page-specific Nav bars here
# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
# $Nav->addNavSeparator("My Page Links", "downloads.php");
@@ -18,11 +18,11 @@
# End: page-specific settings
#
-
+
# Paste your HTML content between the EOHTML markers!
include("../_sideBars.php");
-
+
$html = <<<EOHTML
<div class="maincontent">
<div id="midcolumn">
@@ -43,7 +43,7 @@
<td>
<table border="0" cellpadding="0">
<tr>
- <td><font size=+0><a href="http://wiki.eclipse.org/index.php/Mylyn_Extensions">Extensions</a></font></td>
+ <td><font size=+0><a href="http://wiki.eclipse.org/index.php/Mylyn_Extensions">Extensions</a></font></td>
</tr>
<tr><td>Additional Connectors and Bridges</td></tr>
</table>
@@ -52,7 +52,7 @@
<td>
<table border="0" cellpadding="0">
<tr>
- <td><font size=+0><a href="/mylyn/support">Support</a></font></td>
+ <td><font size=+0><a href="/mylyn/support">Support</a></font></td>
</tr>
<tr><td>Community and commercial support</td></tr>
</table>
@@ -61,7 +61,7 @@
<td>
<table border="0" cellpadding="0">
<tr>
- <td><span style="white-space: nowrap"><font size=+0><a href="/mylyn/downloads/archive.php">Older Downloads</a></font></span></td>
+ <td><span style="white-space: nowrap"><font size=+0><a href="/mylyn/downloads/archive.php">Older Downloads</a></font></span></td>
</tr>
<tr><td>Download archive and support for Eclipse 3.7, 3.6, 3.5, 3.4, 3.3 and 3.2</td></tr>
</table>
@@ -85,7 +85,7 @@
</div>
<div class="homeitem3col">
- <a name="weekly"></a>
+ <a name="weekly"></a>
<h3>Snapshot Builds <a title="More Info" href="http://wiki.eclipse.org/index.php/Mylyn/FAQ#Installation"><img border=0 src="/mylyn/images/icon-help.gif"></a></h3>
<br> <a href="http://www.eclipse.org/mylyn/new/weekly.php">New & Noteworthy</a> Weekly builds are production quality, but subject to UI changes.
<ul>
@@ -119,7 +119,7 @@
<img border=0 src="/mylyn/images/icon-save.gif">
</a>
<b>Download WikiText Standalone (latest)</b>
- </li>
+ </li>
</ul>
</div>
@@ -132,7 +132,7 @@
<td>
<table border="0" cellpadding="0">
<tr>
- <td><font size=+0><a href="http://tasktop.com">Tasktop<img border="0" src="/mylyn/images/external-link.png"></a></font></td>
+ <td><font size=+0><a href="http://tasktop.com">Tasktop<img border="0" src="/mylyn/images/external-link.png"></a></font></td>
</tr>
<tr><td>Numerous connectors and productivity features, supported by the creators of Mylyn. Free trial available.</td></tr>
</table>
@@ -154,7 +154,7 @@
$side_announce
<!--
<div class="sideitem">
- <h6>New Users</h6>
+ <h6>New Users</h6>
<p style="padding-left: 5px;">You can download Eclipse with Mylyn in most of the <a href="http://www.eclipse.org/downloads/">Eclipse Bundles</a>,
then look for updates using the sites below. <br><b>Eclipse 3.2 users</b>: use the <a href="http://www.eclipse.org/mylyn/builds">Mylyn 2.0 release</a>.</p>
</div>
diff --git a/index.php b/index.php
index dfce4dc..c83c680 100644
--- a/index.php
+++ b/index.php
@@ -72,23 +72,23 @@
<div class="news_item">
<div class="news_item_date">2011/06/28</div>
<div class="news_item_title"><a href="http://jaxenter.com/mik-kersten-jaxconf-2011-36569.html" target="_new">
- Mik Kersten on Eclipse Indigo and new features in Mylyn 3.6<img border="0" src="/mylyn/images/external-link.png"></a></div>
+ Mik Kersten on Eclipse Indigo and new features in Mylyn 3.6<img border="0" src="/mylyn/images/external-link.png"></a></div>
</div>
<div class="news_item">
<div class="news_item_date">2011/06/22</div>
<div class="news_item_title"><a href="http://tasktop.com/resources/videos/git-gerrit-hudson-one-mylyn" target="_new">
- Git, Gerrit, Hudson and one Mylyn to rule them all<img border="0" src="/mylyn/images/external-link.png"></a></div>
+ Git, Gerrit, Hudson and one Mylyn to rule them all<img border="0" src="/mylyn/images/external-link.png"></a></div>
<div class="news_item_description">presentation by Steffen Pingel and Benjamin Muskalla</div>
</div>
<div class="news_item">
<div class="news_item_date">2011/01/25</div>
<div class="news_item_title"><a target="_new" href="http://tasktop.com/thought-leadership">
- Read Mik Kersten's predictions on Eclipse, Mylyn and ALM<img border="0" src="/mylyn/images/external-link.png"></a></div>
+ Read Mik Kersten's predictions on Eclipse, Mylyn and ALM<img border="0" src="/mylyn/images/external-link.png"></a></div>
</div>
<div class="news_item">
<div class="news_item_date">2010/09/16</div>
<div class="news_item_title"><a target="_new" href="http://tasktop.com/blog/eclipse/mylyn-top-level-eclipse-project">
- Mylyn promoted to top-level Eclipse project<img border="0" src="/mylyn/images/external-link.png"></a></div>
+ Mylyn promoted to top-level Eclipse project<img border="0" src="/mylyn/images/external-link.png"></a></div>
</div>
<div class="news_item">
<div class="news_item_date">2008/07/30</div>
diff --git a/new/all.php b/new/all.php
index 1361ff3..1a6170f 100644
--- a/new/all.php
+++ b/new/all.php
@@ -139,4 +139,4 @@
# Generate the web page
$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/new/index.php b/new/index.php
index 5389453..159f2f8 100644
--- a/new/index.php
+++ b/new/index.php
@@ -3,7 +3,7 @@
#*****************************************************************************
#
#****************************************************************************
-
+
#
$pageTitle = "Mylyn New & Noteworthy";
$pageKeywords = "Mylyn, Eclipse";
@@ -36,7 +36,6 @@
</div>
EOHTML;
-
# Generate the web page
$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+?>
\ No newline at end of file
diff --git a/new/new-3.14.html b/new/new-3.14.html
index 2eca243..caf2188 100644
--- a/new/new-3.14.html
+++ b/new/new-3.14.html
@@ -68,7 +68,6 @@
</p>
-
<ul>
<li><a href="#gerrit">Gerrit Connector</a></li>
<li><a href="#hudson">Hudson/Jenkins Connector</a></li>
diff --git a/updates.xml b/updates.xml
index c16b16f..1a64dfc 100644
--- a/updates.xml
+++ b/updates.xml
@@ -26,4 +26,4 @@
<description>Mylyn 3.14 is <a href="http://eclipse.org/mylyn/downloads/">now available</a>.</description>
</item>
</channel>
-</rss>
+</rss>
\ No newline at end of file
