Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-02-06 00:14:13 +0000
committerMatthias Sohn2015-02-11 12:33:46 +0000
commite6c40ba9f06677e0b3b55c9bf24b4c8c98669342 (patch)
tree1ac58831a113b14755b6dbd956dfa388fdbf7612
parentd9754134f067f1617ec419ada7c40a1c58af42ec (diff)
downloadegit-e6c40ba9f06677e0b3b55c9bf24b4c8c98669342.tar.gz
egit-e6c40ba9f06677e0b3b55c9bf24b4c8c98669342.tar.xz
egit-e6c40ba9f06677e0b3b55c9bf24b4c8c98669342.zip
Make welcome page contribution more consistent
* Use similar words as the CVS team provider uses. * Use EGit icon instead of Git icon * Link to user guide in help content instead of linking to wiki Bug: 459238 Change-Id: I3d94fba6b2c68ad758ebc62859e89a23b8f0d9d5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 8820b8acd84c3967b79fd6c01f1615aaeca18901)
-rw-r--r--org.eclipse.egit.doc/images/topiclabel/egit.pngbin0 -> 1629 bytes
-rw-r--r--org.eclipse.egit.doc/images/topiclabel/git48.pngbin2081 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/intro/css/overview.css4
-rw-r--r--org.eclipse.egit.doc/intro/css/overview.properties6
-rw-r--r--org.eclipse.egit.doc/intro/css/tutorials.css4
-rw-r--r--org.eclipse.egit.doc/intro/css/tutorials.properties6
-rw-r--r--org.eclipse.egit.doc/intro/css/whatsnew.css4
-rw-r--r--org.eclipse.egit.doc/intro/css/whatsnew.properties6
-rw-r--r--org.eclipse.egit.doc/intro/overviewExtensionContent.xml6
-rw-r--r--org.eclipse.egit.doc/intro/tutorialsExtensionContent.xml8
-rw-r--r--org.eclipse.egit.doc/intro/whatsnewExtensionContent.xml4
11 files changed, 24 insertions, 24 deletions
diff --git a/org.eclipse.egit.doc/images/topiclabel/egit.png b/org.eclipse.egit.doc/images/topiclabel/egit.png
new file mode 100644
index 0000000000..799df8578e
--- /dev/null
+++ b/org.eclipse.egit.doc/images/topiclabel/egit.png
Binary files differ
diff --git a/org.eclipse.egit.doc/images/topiclabel/git48.png b/org.eclipse.egit.doc/images/topiclabel/git48.png
deleted file mode 100644
index ed944ac3a1..0000000000
--- a/org.eclipse.egit.doc/images/topiclabel/git48.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/intro/css/overview.css b/org.eclipse.egit.doc/intro/css/overview.css
index 3e02e3c241..aed197dc73 100644
--- a/org.eclipse.egit.doc/intro/css/overview.css
+++ b/org.eclipse.egit.doc/intro/css/overview.css
@@ -1,7 +1,7 @@
a#egit-overview img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
}
a#egit-overview:hover img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
} \ No newline at end of file
diff --git a/org.eclipse.egit.doc/intro/css/overview.properties b/org.eclipse.egit.doc/intro/css/overview.properties
index 3a104bf46f..a6b8131070 100644
--- a/org.eclipse.egit.doc/intro/css/overview.properties
+++ b/org.eclipse.egit.doc/intro/css/overview.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010 Chris Aniszczyk and others.
+# Copyright (c) 2010, 2015 Chris Aniszczyk and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
###############################################################################
-overview.egit-overview.link-icon = images/topiclabel/git48.png
-overview.egit-overview.hover-icon = images/topiclabel/git48.png
+overview.egit-overview.link-icon = images/topiclabel/egit.png
+overview.egit-overview.hover-icon = images/topiclabel/egit.png
diff --git a/org.eclipse.egit.doc/intro/css/tutorials.css b/org.eclipse.egit.doc/intro/css/tutorials.css
index 3253e0560b..f6a6f1bbef 100644
--- a/org.eclipse.egit.doc/intro/css/tutorials.css
+++ b/org.eclipse.egit.doc/intro/css/tutorials.css
@@ -1,7 +1,7 @@
a#egit-guide img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
}
a#egit-guide:hover img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
} \ No newline at end of file
diff --git a/org.eclipse.egit.doc/intro/css/tutorials.properties b/org.eclipse.egit.doc/intro/css/tutorials.properties
index 6a3e2e5616..188d1103c5 100644
--- a/org.eclipse.egit.doc/intro/css/tutorials.properties
+++ b/org.eclipse.egit.doc/intro/css/tutorials.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010 Chris Aniszczyk and others.
+# Copyright (c) 2010, 2015 Chris Aniszczyk and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
###############################################################################
-tutorials.egit-guide.link-icon = images/topiclabel/git48.png
-tutorials.egit-guide.hover-icon = images/topiclabel/git48.png
+tutorials.egit-guide.link-icon = images/topiclabel/egit.png
+tutorials.egit-guide.hover-icon = images/topiclabel/egit.png
diff --git a/org.eclipse.egit.doc/intro/css/whatsnew.css b/org.eclipse.egit.doc/intro/css/whatsnew.css
index cae10b2931..3dd00311ff 100644
--- a/org.eclipse.egit.doc/intro/css/whatsnew.css
+++ b/org.eclipse.egit.doc/intro/css/whatsnew.css
@@ -1,7 +1,7 @@
a#egit-noteworthy img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
}
a#egit-noteworthy:hover img {
- background-image: url(../../images/topiclabel/git48.png);
+ background-image: url(../../images/topiclabel/egit.png);
} \ No newline at end of file
diff --git a/org.eclipse.egit.doc/intro/css/whatsnew.properties b/org.eclipse.egit.doc/intro/css/whatsnew.properties
index 557fe85187..57c6fa3094 100644
--- a/org.eclipse.egit.doc/intro/css/whatsnew.properties
+++ b/org.eclipse.egit.doc/intro/css/whatsnew.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010 Chris Aniszczyk and others.
+# Copyright (c) 2010, 2015 Chris Aniszczyk and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
###############################################################################
-whatsnew.egit-noteworthy.link-icon = images/topiclabel/git48.png
-whatsnew.egit-noteworthy.hover-icon = images/topiclabel/git48.png
+whatsnew.egit-noteworthy.link-icon = images/topiclabel/egit.png
+whatsnew.egit-noteworthy.hover-icon = images/topiclabel/egit.png
diff --git a/org.eclipse.egit.doc/intro/overviewExtensionContent.xml b/org.eclipse.egit.doc/intro/overviewExtensionContent.xml
index 415410a248..68d274eb39 100644
--- a/org.eclipse.egit.doc/intro/overviewExtensionContent.xml
+++ b/org.eclipse.egit.doc/intro/overviewExtensionContent.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
- Copyright (c) 2010 Chris Aniszczyk and others.
+ Copyright (c) 2010, 2015 Chris Aniszczyk and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -13,8 +13,8 @@
<extensionContent id="org.eclipse.egit" name="EGit"
style="css/overview.css" alt-style="css/overview.properties" path="overview/@">
<group id="content-group" style-id="content-group">
- <link label="Git"
- url="http://wiki.eclipse.org/EGit/User_Guide"
+ <link label="Team Support with Git"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html"
id="egit-overview" style-id="content-link">
<text>Learn about Git in Eclipse by reading the EGit User Guide</text>
</link>
diff --git a/org.eclipse.egit.doc/intro/tutorialsExtensionContent.xml b/org.eclipse.egit.doc/intro/tutorialsExtensionContent.xml
index 4b8f128275..146cd5a8f8 100644
--- a/org.eclipse.egit.doc/intro/tutorialsExtensionContent.xml
+++ b/org.eclipse.egit.doc/intro/tutorialsExtensionContent.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
- Copyright (c) 2010 Chris Aniszczyk and others.
+ Copyright (c) 2010, 2015 Chris Aniszczyk and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-
+
Contributors:
Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
-->
@@ -12,9 +12,9 @@
<introContent>
<extensionContent id="org.eclipse.egit" name="EGit"
style="css/tutorials.css" alt-style="css/tutorials.properties" path="tutorials/@">
- <group label="Git" id="egit" style-id="content-group">
+ <group label="Team Support with Git" id="egit" style-id="content-group">
<link
- url="http://wiki.eclipse.org/EGit/User_Guide"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html"
label="Read the EGit User Guide" id="egit-guide" style-id="content-link">
<text>Learn about using Git in Eclipse</text>
</link>
diff --git a/org.eclipse.egit.doc/intro/whatsnewExtensionContent.xml b/org.eclipse.egit.doc/intro/whatsnewExtensionContent.xml
index b3ec02edd1..5aa0f68363 100644
--- a/org.eclipse.egit.doc/intro/whatsnewExtensionContent.xml
+++ b/org.eclipse.egit.doc/intro/whatsnewExtensionContent.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?><!--
- Copyright (c) 2010 Chris Aniszczyk and others.
+ Copyright (c) 2010, 2015 Chris Aniszczyk and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@
<extensionContent id="org.eclipse.egit" name="EGit"
style="css/whatsnew.css" alt-style="css/whatsnew.properties" path="whatsnew/@">
<group id="content-group" style-id="content-group">
- <link label="Git"
+ <link label="Team Support with Git"
url="http://wiki.eclipse.org/EGit/New_and_Noteworthy"
id="egit-noteworthy" style-id="content-link">
<text>

Back to the top