Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-06-26 13:53:51 +0000
committerMatthias Sohn2015-07-06 11:29:14 +0000
commitfc8e3810b511ea9d9ce3647533909afa06c6f5de (patch)
treef1cc5c9c20559bbdd4d083a41adcdc8801bee897 /org.eclipse.egit.repository
parentd46e03b5cd2828d4a84153e0537d761f7f7fbc40 (diff)
downloadegit-fc8e3810b511ea9d9ce3647533909afa06c6f5de.tar.gz
egit-fc8e3810b511ea9d9ce3647533909afa06c6f5de.tar.xz
egit-fc8e3810b511ea9d9ce3647533909afa06c6f5de.zip
Fix HTML page generated for p2 repository content
By default org.jboss.tools.tycho-plugins:repository-utils generates a page tailored for JBoss which isn't appropriate for EGit. See https://dev.eclipse.org/mhonarc/lists/egit-dev/msg03888.html and https://github.com/jbosstools/jbosstools-maven-plugins/wiki Change-Id: I692b279c5f174481bb4467541535e8fc4aa97411 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.repository')
-rw-r--r--org.eclipse.egit.repository/pom.xml9
-rw-r--r--org.eclipse.egit.repository/siteTemplate/index.html59
-rw-r--r--org.eclipse.egit.repository/siteTemplate/web/site.css83
3 files changed, 151 insertions, 0 deletions
diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml
index 503aaec739..3a8fdebc95 100644
--- a/org.eclipse.egit.repository/pom.xml
+++ b/org.eclipse.egit.repository/pom.xml
@@ -84,6 +84,15 @@
<goal>generate-repository-facade</goal>
</goals>
<configuration>
+ <siteTemplateFolder>siteTemplate/</siteTemplateFolder>
+ <!-- Symbols are used while expanding index.html template -->
+ <symbols>
+ <update.site.name>EGit p2 Repository</update.site.name>
+ <update.site.description>Use this URL in Eclipse to install EGit and JGit</update.site.description>
+ <update.site.version>${project.version}</update.site.version>
+ <target.eclipse.version>3.8.2 / 4.2.2 (Juno) or newer</target.eclipse.version>
+ </symbols>
+ <p2StatsUrl>http://download.eclipse.org/stats/egit/${project.artifactId}/${project.version}</p2StatsUrl>
<associateSites>
<site>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</site>
</associateSites>
diff --git a/org.eclipse.egit.repository/siteTemplate/index.html b/org.eclipse.egit.repository/siteTemplate/index.html
new file mode 100644
index 0000000000..b4a23db954
--- /dev/null
+++ b/org.eclipse.egit.repository/siteTemplate/index.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<title>${update.site.name} - ${update.site.description} ${update.site.version}</title>
+<link rel="stylesheet" type="text/css" href="web/site.css">
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
+<table cellspacing="0" cellpadding="0" class="table">
+ <tr>
+ <td colspan="3" class="td_header">&nbsp;</td>
+ </tr>
+ <tr>
+ <td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
+ <td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
+ <td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
+ </tr>
+ <tr>
+ <td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
+ <td>
+ <h2 class="title">${update.site.name} - ${update.site.description}</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: ${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b${update.site.description}</b>
+ ${update.site.name}.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="https://www.eclipse.org/egit/download/">install</a>
+ from this site, start up Eclipse ${target.eclipse.version}, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
+ </tr>
+ <tr class="bodyText">
+ ${site.contents}
+ </tr>
+</center>
+</html>
diff --git a/org.eclipse.egit.repository/siteTemplate/web/site.css b/org.eclipse.egit.repository/siteTemplate/web/site.css
new file mode 100644
index 0000000000..b5903d592f
--- /dev/null
+++ b/org.eclipse.egit.repository/siteTemplate/web/site.css
@@ -0,0 +1,83 @@
+<
+STYLE type ="text/css">td.spacer {
+ padding-bottom: 10px;
+ padding-top: 10px;
+}
+
+.title {
+ font-family: sans-serif;
+ color: #1778be;
+}
+
+.table {
+ margin-top: 0px;
+ margin-left: 0px;
+ width: 920px;
+}
+
+.bodyText {
+ font-family: sans-serif;
+ font-size: 11pt;
+ color: #000000;
+ width: 100%
+}
+
+.sub-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 11pt;
+ color: white;
+}
+
+.log-text {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: lighter;
+ font-size: 9pt;
+ color: black;
+}
+
+.big-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 11pt;
+ color: white;
+ border-top: 10px solid white;
+}
+
+.light-row {
+ background: #FFFFFF
+}
+
+.dark-row {
+ background: #EEEEEE
+}
+
+.header {
+ background: #445562
+}
+
+#indent {
+ word-wrap: break-word;
+ width: 300px;
+ text-indent: 10px;
+}
+
+.link {
+ color: #187dc6;
+}
+
+.td_header {
+ background: url("https://www.eclipse.org/egit/images/backgroundMain.png") 0 no-repeat;
+ height: 100px;
+}
+
+.column-header {
+ font-size:small;
+}
+
+</
+STYLE
+>

Back to the top