*** empty log message ***

9 files changed, 54 insertions, 19 deletions

diff --git a/org.eclipse.ui.intro.universal/plugin.xml b/org.eclipse.ui.intro.universal/plugin.xml
index ecbb1a29d..ef49d95b8 100644
--- a/org.eclipse.ui.intro.universal/plugin.xml
+++ b/org.eclipse.ui.intro.universal/plugin.xml
@@ -31,13 +31,11 @@
             introId="org.eclipse.ui.intro.universal">
          <presentation
                home-page-id="root" standby-page-id="standby">
-               <!-- -->
               <implementation
                   style="$theme$/html/shared.css"
                   kind="html"
                   os="win32,linux,macosx">
             </implementation>
-            <!-- -->
             <implementation
                   kind="swt">
             </implementation>
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/firststeps.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/firststeps.properties
index cc62a3453..3f144a88d 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/firststeps.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/firststeps.properties
@@ -1,3 +1,2 @@
 firststeps.page-content.layout.ncolumns = 2
-firststeps.page-content.bottom.layout.colspan = 2
 firstseps.subtitle-id = firststeps/page-content/page-title
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/migrate.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/migrate.properties
index a45e8d993..9d021b0b5 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/migrate.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/migrate.properties
@@ -1,3 +1,2 @@
 migrate.page-content.layout.ncolumns = 2
-migrate.page-content.bottom.layout.colspan = 2
 migrate.subtitle-id = migrate/page-content/page-title
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/overview.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/overview.properties
index 89a574dc8..ada419da2 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/overview.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/overview.properties
@@ -1,6 +1,5 @@
 
 overview.page-content.layout.ncolumns = 2
-overview.page-content.bottom.layout.colspan = 2
 
 overview.subtitle-id = overview/page-content/page-title
 overview.description-id = overview/page-content/page-description
\ No newline at end of file
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/samples.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/samples.properties
index fbbe9c49b..18f7058d0 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/samples.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/samples.properties
@@ -1,7 +1,6 @@
 
 samples.page-content.layout.vspacing = 40
 samples.page-content.layout.ncolumns = 2
-samples.page-content.bottom.layout.colspan = 2
 
 description-style-id = group-description
 samples.subtitle-id = samples/page-content/page-title
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/tutorials.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/tutorials.properties
index de1d07215..2a8ba0f3b 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/tutorials.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/tutorials.properties
@@ -1,7 +1,6 @@
 
 tutorials.page-content.layout.vspacing = 40
 tutorials.page-content.layout.ncolumns = 2
-tutorials.page-content.bottom.layout.colspan = 2
 
 tutorials.subtitle-id = tutorials/page-content/page-title
 tutorials.description-id = tutorials/page-content/page-description
\ No newline at end of file
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/whatsnew.properties b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/whatsnew.properties
index 2a732e2f9..0ef408b00 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/whatsnew.properties
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/swt/whatsnew.properties
@@ -1,7 +1,6 @@
 theme = true
 whatsnew.page-content.layout.vspacing = 40 
 whatsnew.page-content.layout.ncolumns = 2
-whatsnew.page-content.bottom.layout.colspan = 2
 
 whatsnew.link-icon = ../graphics/icons/obj48/new_obj.gif
 whatsnew.hover-icon = ../graphics/icons/obj48/newhov_obj.gif
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/loader/ModelLoaderUtil.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/loader/ModelLoaderUtil.java
index 5087fc0a2..8cb71d8f4 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/loader/ModelLoaderUtil.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/loader/ModelLoaderUtil.java
@@ -204,7 +204,7 @@ public class ModelLoaderUtil {
      * @return
      */
     public static StringBuffer createPathToElementKey(
-            AbstractIntroIdElement element) {
+            AbstractIntroIdElement element, boolean full) {
         if (element.getId() == null)
             return null;
         StringBuffer buffer = new StringBuffer(element.getId());
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
index 239adb70f..fc9eb6f22 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.internal.intro.impl.model.AbstractBaseIntroElement;
 import org.eclipse.ui.internal.intro.impl.model.AbstractIntroContainer;
 import org.eclipse.ui.internal.intro.impl.model.AbstractIntroElement;
+import org.eclipse.ui.internal.intro.impl.model.AbstractIntroIdElement;
 import org.eclipse.ui.internal.intro.impl.model.AbstractIntroPage;
 import org.eclipse.ui.internal.intro.impl.model.IntroGroup;
 import org.eclipse.ui.internal.intro.impl.model.IntroImage;
@@ -192,7 +193,7 @@ public class PageStyleManager extends SharedStyleManager {
 
     private int getIntProperty(AbstractBaseIntroElement element,
             String qualifier, int defaultValue) {
-        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(element);
+        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(element, true);
         if (buff == null)
             return defaultValue;
         String key = buff.append(qualifier).toString();
@@ -229,7 +230,7 @@ public class PageStyleManager extends SharedStyleManager {
      * @return
      */
     public String getDescription(IntroGroup group) {
-        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(group);
+        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(group, true);
         if (buff == null)
             return null;
         String key = buff.append(".description-id").toString(); //$NON-NLS-1$
@@ -369,7 +370,7 @@ public class PageStyleManager extends SharedStyleManager {
 
 
     public Color getColor(FormToolkit toolkit, AbstractBaseIntroElement element) {
-        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(element);
+        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(element, true);
         if (buff == null)
             return null;
         String key = buff.append(".font.fg").toString(); //$NON-NLS-1$
@@ -378,13 +379,19 @@ public class PageStyleManager extends SharedStyleManager {
 
     public boolean isBold(IntroText text) {
         String value = null;
-        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(text);
+        /*
+        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(text, true);
         if (buff != null) {
             String key = buff.append(".font.bold").toString(); //$NON-NLS-1$
             value = getProperty(key);
             if (value != null)
                 return value.toLowerCase().equals("true"); //$NON-NLS-1$
+            else {
+                buff = ModelLoaderUtil.createPathToElementKey(text, true);
+            }
         }
+        */
+        value = getPropertyValue(text, ".font.bold"); //$NON-NLS-1$
         if (value == null) {
             // bold is not specified by ID. Check to see if there is a style-id
             // specified for bold.
@@ -394,6 +401,24 @@ public class PageStyleManager extends SharedStyleManager {
         }
         return false;
     }
+    
+    private String getPropertyValue(AbstractIntroIdElement element, String suffix) {
+        StringBuffer buff = ModelLoaderUtil.createPathToElementKey(element, true);
+        if (buff != null) {
+        	String key = buff.append(suffix).toString();
+        	String value = getProperty(key);
+        	if (value != null)
+        		return value;
+        	// try the page.id key
+        	buff = ModelLoaderUtil.createPathToElementKey(element, false);
+        	if (buff!= null) {
+        		key = buff.append(suffix).toString();
+        		value = getProperty(key);
+        		return value;
+        	}
+        }
+        return null;
+    }
 
     public static Font getBannerFont() {
         return JFaceResources.getBannerFont();
@@ -412,10 +437,15 @@ public class PageStyleManager extends SharedStyleManager {
      * @return
      */
     public Image getImage(IntroLink link, String qualifier, String defaultKey) {
-        String key = createImageKey(page, link, qualifier);
-        // special case where we have to handle this because extended code does
-        // not go through getProperty() in this method.
-        String value = getProperty(key, false);
+    	// try the Id first
+    	String key = createImageByIdKey(page, link, qualifier);
+    	String value = getProperty(key, false);
+    	if (value==null) {
+    		key = createImageKey(page, link, qualifier);
+    		// special case where we have to handle this because extended code does
+    		// not go through getProperty() in this method.
+    		value = getProperty(key, false);
+    	}
         if (value == null && page.getId() != null
                 && key.startsWith(page.getId()))
             // did not use the key as-is. Trim pageId and try again.
@@ -431,7 +461,7 @@ public class PageStyleManager extends SharedStyleManager {
             String qualifier) {
         StringBuffer buff = null;
         if (link != null) {
-            buff = ModelLoaderUtil.createPathToElementKey(link);
+            buff = ModelLoaderUtil.createPathToElementKey(link, true);
             if (buff == null)
                 return ""; //$NON-NLS-1$
         } else {
@@ -442,10 +472,23 @@ public class PageStyleManager extends SharedStyleManager {
         buff.append(qualifier);
         return buff.toString();
     }
+    
+    private String createImageByIdKey(AbstractIntroPage page, IntroLink link,
+            String qualifier) {
+    	if (link==null || link.getId()==null)
+    		return ""; //$NON-NLS-1$
+        StringBuffer buff = new StringBuffer();
+        buff.append(page.getId());
+        buff.append("."); //$NON-NLS-1$
+        buff.append(link.getId());
+        buff.append("."); //$NON-NLS-1$
+        buff.append(qualifier);
+        return buff.toString();
+    }
 
     public Image getImage(IntroImage introImage) {
         String imageLocation = introImage.getSrcAsIs();
-        String key = ModelLoaderUtil.createPathToElementKey(introImage)
+        String key = ModelLoaderUtil.createPathToElementKey(introImage, true)
             .toString();
         if (ImageUtil.hasImage(key))
             return ImageUtil.getImage(key);