*** empty log message ***

22 files changed, 69 insertions, 10 deletions

diff --git a/org.eclipse.ui.intro.universal/plugin.properties b/org.eclipse.ui.intro.universal/plugin.properties
index 80a220bbd..4bf1401c7 100644
--- a/org.eclipse.ui.intro.universal/plugin.properties
+++ b/org.eclipse.ui.intro.universal/plugin.properties
@@ -16,5 +16,5 @@
 plugin_name = Universal Welcome
 provider_name = Eclipse.org
 
-theme.name.circles = Circles
-theme.name.purpleMesh = Purple Mesh
\ No newline at end of file
+theme.name.circles = Circles (Experimental)
+theme.name.purpleMesh = Purple Mesh (Classic Eclipse)
\ No newline at end of file
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/firsteps_wtr.jpg b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/firsteps_wtr.jpg
new file mode 100644
index 000000000..c8d3d20f2
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/firsteps_wtr.jpg
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/webrsrc_wtr.jpg b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/webrsrc_wtr.jpg
new file mode 100644
index 000000000..c002f2d9b
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/contentpage/webrsrc_wtr.jpg
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48.gif
new file mode 100644
index 000000000..c736b26c5
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48sel.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48sel.gif
new file mode 100644
index 000000000..4462a8bf5
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps48sel.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps72.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps72.gif
new file mode 100644
index 000000000..9bb47fef4
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/firsteps72.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48.gif
new file mode 100644
index 000000000..09c94c82b
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48sel.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48sel.gif
new file mode 100644
index 000000000..a786efbba
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc48sel.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc72.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc72.gif
new file mode 100644
index 000000000..fbcfc202a
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/ctool/webrsrc72.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48.gif
new file mode 100644
index 000000000..656d31f0f
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48sel.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48sel.gif
new file mode 100644
index 000000000..be46c41d2
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps48sel.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps72.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps72.gif
new file mode 100644
index 000000000..7e055f01e
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/firsteps72.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48.gif
new file mode 100644
index 000000000..b672a5429
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48sel.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48sel.gif
new file mode 100644
index 000000000..903cc98e8
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc48sel.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc72.gif b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc72.gif
new file mode 100644
index 000000000..f6997df60
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/graphics/icons/etool/webrsrc72.gif
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/firststeps.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/firststeps.css
new file mode 100644
index 000000000..7a67b3208
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/firststeps.css
@@ -0,0 +1,8 @@
+body {
+	background-image : url(../graphics/contentpage/firsteps_wtr.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#firststeps img, #navigation-links a#firststeps:hover img { 
+	background-image : url(../graphics/icons/ctool/firsteps48sel.gif); 
+}
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
index 4b01ccae3..1a3c077ae 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
@@ -144,6 +144,12 @@ body {
 #page-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew72.gif); }
 #page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
 
+#page-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps72.gif); }
+#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firsteps72.gif); }
+
+#page-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc72.gif); }
+#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webrsrc72.gif); }
+
 /*
  * Set up the action links
  */
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
index 7b72862f2..f70572d20 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
@@ -233,6 +233,16 @@ body, .page{
 #navigation-links a#whatsnew:focus img,
 #navigation-links a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
 
+#navigation-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
+#navigation-links a#firststeps:hover img,
+#navigation-links a#firststeps:focus img,
+#navigation-links a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
+
+#navigation-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
+#navigation-links a#webresources:hover img,
+#navigation-links a#webresources:focus img,
+#navigation-links a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
+
 #navigation-links a#workbench { position : absolute;  right : 0px; top : -35px; text-align : right;}
 #navigation-links a#workbench .text { display : none; }
 #navigation-links a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}
@@ -366,6 +376,8 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
  */
  
 .content-group {
+	margin-left: 10px;
+	margin-right: 10px;
 	padding-left: 10px;
 	padding-right: 10px;
 	float : none;
@@ -385,13 +397,9 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
 
 .content-group > .content-link {
 	float : left;
-	/*
-	height : 150px;
-	*/
 	vertical-align : middle;
 }
 
-
 .content-link img  {
 	height : 57px;
 	width : 57px;
@@ -426,7 +434,6 @@ p #group-description {
 
 .content-link:hover { border-right : 0px; }
 
-
 iframe {
 	position:relative;
 	top:16px;
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/standby.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/standby.css
index 5aa519b2a..2af217a21 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/standby.css
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/standby.css
@@ -19,6 +19,15 @@
 }
 
 /*
+ * We will not use the general-purpose group1 used in
+ * other pages for a curve image.
+ */
+
+#extra-group1 {
+	display : none;
+}
+
+/*
  * Set up the content for the standby page.
  */
 body {
@@ -125,6 +134,16 @@ a#whatsnew:hover img,
 a#whatsnew:focus img,
 a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
 
+a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
+a#firststeps:hover img,
+a#firststeps:focus img,
+a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
+
+a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
+a#webresources:hover img,
+a#webresources:focus img,
+a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
+
 a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); }
 a#workbench:hover img,
 a#workbench:focus img,
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/webresources.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/webresources.css
new file mode 100644
index 000000000..6b6c99d55
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/webresources.css
@@ -0,0 +1,8 @@
+body {
+	background-image : url(../graphics/contentpage/webrsrc_wtr.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#webresources img, #navigation-links a#webresources:hover img { 
+	background-image : url(../graphics/icons/ctool/webrsrc48sel.gif); 
+}
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/root.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/root.properties
index 49243e5d7..c752055f0 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/root.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/root.properties
@@ -3,12 +3,16 @@ root.links-background.page-links.overview.link-icon = ../graphics/icons/etool/ov
 root.links-background.page-links.tutorials.link-icon = ../graphics/icons/etool/tutorials72.gif
 root.links-background.page-links.samples.link-icon= ../graphics/icons/etool/samples72.gif
 root.links-background.page-links.whatsnew.link-icon = ../graphics/icons/etool/whatsnew72.gif
+root.links-background.page-links.firststeps.link-icon = ../graphics/icons/etool/firsteps72.gif
+root.links-background.page-links.webresources.link-icon = ../graphics/icons/etool/webrsrc72.gif
 root.action-links.workbench.link-icon = ../graphics/icons/etool/wb48.gif
 
 root.links-background.page-links.overview.hover-icon = ../graphics/icons/ctool/overview72.gif
 root.links-background.page-links.tutorials.hover-icon = ../graphics/icons/ctool/tutorials72.gif
 root.links-background.page-links.samples.hover-icon = ../graphics/icons/ctool/samples72.gif
 root.links-background.page-links.whatsnew.hover-icon = ../graphics/icons/ctool/whatsnew72.gif
+root.links-background.page-links.firststeps.link-icon = ../graphics/icons/etool/firsteps72.gif
+root.links-background.page-links.webresources.link-icon = ../graphics/icons/etool/webrsrc72.gif
 root.action-links.workbench.hover-icon = ../graphics/icons/ctool/wb48.gif
 
 
@@ -16,12 +20,16 @@ root.links-background.page-links.overview.small-link-icon = ../graphics/icons/et
 root.links-background.page-links.tutorials.small-link-icon = ../graphics/icons/etool/tutorials48.gif
 root.links-background.page-links.samples.small-link-icon = ../graphics/icons/etool/samples48.gif
 root.links-background.page-links.whatsnew.small-link-icon = ../graphics/icons/etool/whatsnew48.gif
+root.links-background.page-links.firststeps.small-link-icon = ../graphics/icons/etool/firsteps48.gif
+root.links-background.page-links.webresources.small-link-icon = ../graphics/icons/etool/webrsrc48.gif
 root.action-links.workbench.small-link-icon = ../graphics/icons/etool/wb48.gif
 
 root.links-background.page-links.overview.small-hover-icon = ../graphics/icons/ctool/overview48.gif
 root.links-background.page-links.tutorials.small-hover-icon = ../graphics/icons/ctool/tutorials48.gif
 root.links-background.page-links.samples.small-hover-icon = ../graphics/icons/ctool/samples48.gif
 root.links-background.page-links.whatsnew.small-hover-icon = ../graphics/icons/ctool/whatsnew48.gif
+root.links-background.page-links.firststeps.small-hover-icon = ../graphics/icons/ctool/firsteps48.gif
+root.links-background.page-links.webresources.small-hover-icon = ../graphics/icons/ctool/webrsrc48.gif
 root.action-links.workbench.small-hover-icon = ../graphics/icons/ctool/wb48.gif
 
 root.layout.ncolumns = 1
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/standby.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/standby.properties
index 940b189fa..6df036e6c 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/standby.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/standby.properties
@@ -2,14 +2,17 @@ theme=true
 standby.links-background.page-links.overview.link-icon = ../graphics/icons/etool/overview72.gif
 standby.links-background.page-links.tutorials.link-icon = ../graphics/icons/etool/tutorials72.gif
 standby.links-background.page-links.samples.link-icon= ../graphics/icons/etool/samples72.gif
-standby.links-background.page-links.news.link-icon = ../graphics/icons/etool/whatsnew72.gif
+standby.links-background.page-links.whatsnew.link-icon = ../graphics/icons/etool/whatsnew72.gif
+standby.links-background.page-links.firststeps.link-icon = ../graphics/icons/etool/firsteps72.gif
+standby.links-background.page-links.webresources.link-icon = ../graphics/icons/etool/webrsrc72.gif
 
 
 standby.links-background.page-links.overview.hover-icon = ../graphics/icons/ctool/overview72.gif
 standby.links-background.page-links.tutorials.hover-icon = ../graphics/icons/ctool/tutorials72.gif
 standby.links-background.page-links.samples.hover-icon = ../graphics/icons/ctool/samples72.gif
-standby.links-background.page-links.news.hover-icon = ../graphics/icons/ctool/whatsnew72.gif
-
+standby.links-background.page-links.whatsnew.hover-icon = ../graphics/icons/ctool/whatsnew72.gif
+standby.links-background.page-links.firststeps.link-icon = ../graphics/icons/ctool/firsteps72.gif
+standby.links-background.page-links.webresources.link-icon = ../graphics/icons/ctool/webrsrc72.gif
 
 standby.links-background.page-links.layout.vspacing = 30
 standby.layout.vspacing = 35