Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDejan Gloszic2006-03-09 16:34:27 -0500
committerDejan Gloszic2006-03-09 16:34:27 -0500
commit863c928db8e6cbda74598ed41dc65e090dc12b00 (patch)
treef4ce8953a212d8a5fb8ea278c7becacbb6d9578a
parent08e76e06adfdcb2f942dbae117527691aab01656 (diff)
downloadeclipse.platform.ua-863c928db8e6cbda74598ed41dc65e090dc12b00.tar.gz
eclipse.platform.ua-863c928db8e6cbda74598ed41dc65e090dc12b00.tar.xz
eclipse.platform.ua-863c928db8e6cbda74598ed41dc65e090dc12b00.zip
*** empty log message ***
-rw-r--r--org.eclipse.ui.intro.universal/introContent.xml14
-rw-r--r--org.eclipse.ui.intro.universal/plugin.xml2
-rw-r--r--org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java3
-rw-r--r--org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java3
-rw-r--r--org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties3
-rw-r--r--org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java32
-rw-r--r--org.eclipse.ui.intro.universal/themes/circles/html/root.css170
7 files changed, 127 insertions, 100 deletions
diff --git a/org.eclipse.ui.intro.universal/introContent.xml b/org.eclipse.ui.intro.universal/introContent.xml
index baafc9f08..08512d5ec 100644
--- a/org.eclipse.ui.intro.universal/introContent.xml
+++ b/org.eclipse.ui.intro.universal/introContent.xml
@@ -9,12 +9,7 @@
<group id="links-background">
<group id="page-links" computed="true"/>
</group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench">
- <img id="workbench_img" style-id="content-img" alt="Go to the workbench">
- </img>
- <text>Go to the workbench</text>
- </link>
+ <group id="action-links" computed="true">
</group>
<group id="branding">
<img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
@@ -34,12 +29,7 @@
<group id="page-links" computed="true">
</group>
</group>
- <group id="action-links">
- <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench">
- <img id="workbench_img" style-id="content-img" alt="Go to the workbench">
- </img>
- <text>Go to the workbench</text>
- </link>
+ <group id="action-links" computed="true">
</group>
<group id="branding" style-id="branding" bgImage="$introBrandingImage$">
</group>
diff --git a/org.eclipse.ui.intro.universal/plugin.xml b/org.eclipse.ui.intro.universal/plugin.xml
index 7af92d445..ac56db646 100644
--- a/org.eclipse.ui.intro.universal/plugin.xml
+++ b/org.eclipse.ui.intro.universal/plugin.xml
@@ -55,6 +55,8 @@
name="%theme.name.circles"
path="$nl$/themes/circles"
previewImage="themes/circles/preview.png">
+ <property name="workbenchAsRootLink"
+ value="true"/>
<property name="launchbarBackground"
value="#a1c2cb"/>
<property name="launchbarOverviewIcon"
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
index 17e7afb3e..fedc8d423 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
@@ -82,9 +82,11 @@ public interface IUniversalIntroConstants {
String ID_WHATSNEW = "whatsnew";//$NON-NLS-1$
String ID_MIGRATE = "migrate";//$NON-NLS-1$
String ID_WEBRESOURCES = "webresources";//$NON-NLS-1$
+ String ID_WORKBENCH = "workbench"; //$NON-NLS-1$
// Page DIV ids
String DIV_PAGE_LINKS = "page-links"; //$NON-NLS-1$
+ String DIV_ACTION_LINKS = "action-links"; //$NON-NLS-1$
String DIV_LAYOUT_TOP_LEFT = "top-left"; //$NON-NLS-1$
String DIV_LAYOUT_TOP_RIGHT = "top-right"; //$NON-NLS-1$
String DIV_LAYOUT_BOTTOM_LEFT = "bottom-left"; //$NON-NLS-1$
@@ -94,6 +96,7 @@ public interface IUniversalIntroConstants {
String VAR_INTRO_BACKGROUND_IMAGE = "INTRO_BACKGROUND_IMAGE"; //$NON-NLS-1$
String VAR_INTRO_ROOT_PAGES = "INTRO_ROOT_PAGES"; //$NON-NLS-1$
String VAR_INTRO_DATA = "INTRO_DATA"; //$NON-NLS-1$
+ String VAR_WORKBENCH_AS_ROOT_LINK="workbenchAsRootLink"; //$NON-NLS-1$
//Page table properties
String P_IMPORTANCE = "importance"; //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
index 1d83f75ce..ba28594a1 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
@@ -42,6 +42,9 @@ public class Messages extends NLS {
public static String SharedIntroConfigurer_webresources_name;
public static String SharedIntroConfigurer_webresources_alt;
public static String SharedIntroConfigurer_webresources_tooltip;
+ public static String SharedIntroConfigurer_workbench_name;
+ public static String SharedIntroConfigurer_workbench_alt;
+ public static String SharedIntroConfigurer_workbench_tooltip;
public static String SharedIntroConfigurer_overview_nav;
public static String SharedIntroConfigurer_firststeps_nav;
public static String SharedIntroConfigurer_tutorials_nav;
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties
index c7f6ef303..9b80104d8 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties
@@ -36,6 +36,9 @@ SharedIntroConfigurer_customize_label=Customize
SharedIntroConfigurer_webresources_name=Web Resources
SharedIntroConfigurer_webresources_alt=Web Resources
SharedIntroConfigurer_webresources_tooltip=Read more on the Web
+SharedIntroConfigurer_workbench_name = Workbench
+SharedIntroConfigurer_workbench_alt = Go to the workbench
+SharedIntroConfigurer_workbench_tooltip = Go to the workbench
SharedIntroConfigurer_overview_nav=Overview
SharedIntroConfigurer_firststeps_nav=First Steps
SharedIntroConfigurer_customize_text=Customize page
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
index dabecf10e..69889fc01 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
@@ -137,9 +137,13 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
if (pageId.equals(ID_ROOT)) {
if (groupId.equals(DIV_PAGE_LINKS))
return getRootPageLinks(false);
+ if (groupId.equals(DIV_ACTION_LINKS))
+ return getRootPageActionLinks(false);
} else if (pageId.equals(ID_STANDBY)) {
if (groupId.equals(DIV_PAGE_LINKS))
return getRootPageLinks(true);
+ if (groupId.equals(DIV_ACTION_LINKS))
+ return getRootPageActionLinks(true);
} else {
// other pages
if (groupId.equals(DIV_PAGE_LINKS))
@@ -180,9 +184,28 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
links.add(page);
}
}
+ // add workbench link if so configured by the theme
+ String wb = getVariable(VAR_WORKBENCH_AS_ROOT_LINK);
+ if (wb!=null && wb.equalsIgnoreCase("true")) { //$NON-NLS-1$
+ IntroElement page = createRootPageLink(ID_WORKBENCH, standby);
+ if (page !=null)
+ links.add(page);
+ }
return (IntroElement[]) links.toArray(new IntroElement[links.size()]);
}
+ private IntroElement[] getRootPageActionLinks(boolean standby) {
+ String wb = getVariable(VAR_WORKBENCH_AS_ROOT_LINK);
+ // only create the workbench link if
+ // not already configured as a root link
+ if (wb==null || !wb.equalsIgnoreCase("true")) { //$NON-NLS-1$
+ IntroElement page = createRootPageLink(ID_WORKBENCH, standby);
+ if (page !=null)
+ return new IntroElement[] { page };
+ }
+ return new IntroElement [0];
+ }
+
private IntroElement[] getNavLinks(String pageId) {
ArrayList links = new ArrayList();
String ids = getVariable(VAR_INTRO_ROOT_PAGES);
@@ -250,6 +273,15 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
Messages.SharedIntroConfigurer_webresources_alt,
Messages.SharedIntroConfigurer_webresources_tooltip,
"right"); //$NON-NLS-1$
+ if (id.equals(ID_WORKBENCH))
+ return createRootLink(
+ Messages.SharedIntroConfigurer_workbench_name,
+ "http://org.eclipse.ui.intro/switchToLaunchBar", //$NON-NLS-1$
+ id,
+ "workbench_img", "css/graphics/root/workbench.gif", //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.SharedIntroConfigurer_workbench_alt,
+ Messages.SharedIntroConfigurer_workbench_tooltip,
+ "right"); //$NON-NLS-1$
return null;
}
diff --git a/org.eclipse.ui.intro.universal/themes/circles/html/root.css b/org.eclipse.ui.intro.universal/themes/circles/html/root.css
index e56d7837a..0cf90aa7b 100644
--- a/org.eclipse.ui.intro.universal/themes/circles/html/root.css
+++ b/org.eclipse.ui.intro.universal/themes/circles/html/root.css
@@ -6,13 +6,23 @@
font-size : 18pt;
}
-#page-links a .link-label, #action-links a .link-label {
+/* Hide the extra div for links in the normal state. */
+a .link-extra-div {
+ display: none;
+}
+
+/* Link label properties */
+#page-links a .link-label {
font-size : 13pt; font-weight : 600;
padding-left: 10px;
padding-right: 10px;
+ position: relative;
+ top: -15px;
+ margin-bottom: -10px;
}
-#page-links a p .text, #action-links a p .text {
+/* Link description properties */
+#page-links a p .text {
font-size : 13pt; font-weight : 500;
padding-bottom: 10px;
}
@@ -26,7 +36,7 @@ body {
background-attachment : fixed;
overflow : hidden;
overflow-clip: rect(0, auto, auto, 0);
- background-color : #7169D1;
+ background-color : #345365;
}
#root {
min-height : 450px;
@@ -78,6 +88,9 @@ body {
#page-links a {
position : absolute; margin-left : 1em; margin-right : 1em; text-align : center;
+/*
+ background-color: magenta;
+ */
}
#page-links[id] { position: static; }
@@ -96,11 +109,10 @@ body {
#page-links a#overview {
left: -1px;
top: 5px;
- background-color: magenta;
}
#page-links a#overview:hover {
- left: -5px;
+ left: -2px;
}
#page-links a#overview img {
@@ -113,48 +125,56 @@ body {
height : 99px;
}
+/* Absolute positions of root links */
+
#page-links a#whatsnew {
- left: 149px;
- top: 110px;
+ left: 150px;
+ top: 111px;
}
#page-links a#tutorials {
- left: 430px;
- top: 296px;
+ left: 431px;
+ top: 297px;
}
#page-links a#samples {
- left: 242px;
- top: 296px;
+ left: 243px;
+ top: 297px;
}
#page-links a#firststeps {
- left: 336px;
- top: 110px;
+ left: 337px;
+ top: 111px;
}
#page-links a#webresources {
- left: 523px;
- top: 203px;
+ left: 524px;
+ top: 204px;
}
#page-links a#migrate {
- left: 710px;
- top: 296px;
+ left: 711px;
+ top: 297px;
}
+#page-links a#workbench {
+ left: 808px;
+ top: 111px;
+}
-/* remove the hover image from the flow of the document,
- so it doesn't take up space and change the position
- of the link label and descriptions */
-#page-links a .background-image {
- position : absolute;
+#page-links a:hover#workbench,
+#page-links a:focus#workbench,
+#page-links a:active#workbench {
+ left: 713px;
}
-/* properly align the link label and text based on class (left vs. right) */
-#page-links a:hover {
- /* This is needed for IE to force the hover pseudo selectors below to work.*/ padding : 0 em;
+
+/* Turn the background image off */
+#page-links a .background-image {
+ display : none;
}
+/* Paint bottom edge of the text box as a background image */
+
#page-links a:hover,
#page-links a:focus,
#page-links a:active {
@@ -169,6 +189,15 @@ body {
#page-links a#overview:active {
background-image: url(../graphics/icons/ctool/overview_bottomhov.gif);
background-image: no-repeat;
+ background-position: bottom 1px;
+ z-index: 20;
+}
+
+#page-links a#workbench:hover,
+#page-links a#workbench:focus,
+#page-links a#workbench:active {
+ background-image: url(../graphics/icons/ctool/workbench_bottomhov.gif);
+ background-image: no-repeat;
background-position: bottom left;
z-index: 20;
}
@@ -179,6 +208,8 @@ body {
display : none;
}
+/* Show the link label and link text as block on hover */
+
#page-links a:hover .link-label,
#page-links a:focus .link-label,
#page-links a:active .link-label {
@@ -193,53 +224,56 @@ body {
z-index: 40;
}
-
#page-links a#overview:hover .link-label,
#page-links a#overview:focus .link-label,
#page-links a:overview:active .link-label {
- width: 215px;
+ width: 210px;
}
#page-links a#overview:hover p .text,
#page-links a#overview:focus p .text,
#page-links a:overview:active p .text {
- width: 215px;
+ width: 210px;
}
+/* Use the extra div to fill in the text box behind the text */
+
#page-links a:hover .link-extra-div,
#page-links a:focus .link-extra-div,
#page-links a:active .link-extra-div {
display: block;
position: absolute;
+/*
top : 84px;
+ */
left : 0px;
width: 215px;
- height: auto;
+/*
+ top: 84;
+ */
+ height: 70px;
bottom: 2px;
z-index: -5;
-/*
background-image: url(../graphics/icons/ctool/root_midhov.gif);
background-repeat: repeat-y;
- */
- background-color: cyan;
}
-/*
+
#page-links a#overview:hover .link-extra-div,
#page-links a#overview:focus .link-extra-div,
#page-links a#overview:active .link-extra-div {
- display: block;
- position: absolute;
- top : 99px;
- left : 7px;
+ left : 3px;
width: 217px;
- height: auto;
- bottom: 2px;
- background-image: url(../graphics/icons/ctool/root_midhov.gif);
- background-repeat: repeat-y;
}
-*/
-/* properties for each of the page-links */
+#page-links a#workbench:hover .link-extra-div,
+#page-links a#workbench:focus .link-extra-div,
+#page-links a#workbench:active .link-extra-div {
+ left : 0px;
+ width: 202px;
+ background-image: url(../graphics/icons/ctool/workbench_midhov.gif);
+}
+
+/* Link images */
#page-links a#overview img { background-image : url(../graphics/icons/ctool/overview.gif); }
#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview_tophov.gif); }
@@ -261,52 +295,12 @@ body {
#page-links a#webresources img { background-image : url(../graphics/icons/ctool/webresources.gif); }
#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webresources_tophov.gif); }
+#page-links a#workbench img { background-image : url(../graphics/icons/ctool/workbench.gif); }
+#page-links a:hover#workbench img { background-image : url(../graphics/icons/ctool/workbench_tophov.gif); }
+
/*
- * Set up the action links
+ * Not using action links.
*/
#action-links {
- width : 100%;
- position: absolute;
- top: 50%;
- text-align : center;
-}
-
-#action-links a {
- position : relative;
- top : -50%;
-}
-
-#action-links a .background-image,
-#action-links a #workbench_img {
- width : 202px;
- height : 103px;
- position : absolute;
- left : 364px;
- top : -83px;
-}
-
-#action-links a:hover#workbench img {
-}
-
-#action-links a#workbench img {
- background-image : url(../graphics/icons/ctool/workbench.gif);
-}
-#action-links a:hover#workbench img {
- background-image : url(../graphics/icons/ctool/workbench_tophov.gif);
-}
-
-/* hide the link and description until users hover over the link */
-#action-links a p .text, #action-links a .link-label {
- display : none;
-}
-
-#action-links a:hover .link-label,
-#action-links a:focus .link-label,
-#action-links a:active .link-label {
- display : block; margin-left : 10px;
-}
-#action-links a:hover p .text,
-#action-links a:focus p .text,
-#action-links a:active p .text {
- display : block; width : 16em;
+ display: none;
} \ No newline at end of file

Back to the top