Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Oberhuber2013-05-23 14:16:22 -0400
committerMartin Oberhuber2013-05-23 14:16:22 -0400
commit1db27b27ddbbd85794da5d6ded19c8d5f0401f21 (patch)
treef8d5a91d6c44f3ad81c73ff03531cd9dc1498f16
parente63580e679e9b570c6e95d1b8ddb1cd51969eb91 (diff)
downloadorg.eclipse.epp.packages-1db27b27ddbbd85794da5d6ded19c8d5f0401f21.tar.gz
org.eclipse.epp.packages-1db27b27ddbbd85794da5d6ded19c8d5f0401f21.tar.xz
org.eclipse.epp.packages-1db27b27ddbbd85794da5d6ded19c8d5f0401f21.zip
Bug 408859 - Fix CSS Styling of help documentation in Classic/SDK
- Also fix default perspective to be "Java" and not PDE - Also enable the "Show All Topics" button for Help Capability Filters - Also fix warnings in classic branding bundle: - Add "localScopeCheckbox" element to help activity support extension - Replace Eclipse-LazyStart by Bundle-ActivationPolicy in MANIFEST.MF
-rw-r--r--packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF2
-rw-r--r--packages/org.eclipse.epp.package.classic/about.properties2
-rw-r--r--packages/org.eclipse.epp.package.classic/book.css116
-rw-r--r--packages/org.eclipse.epp.package.classic/build.properties34
-rw-r--r--packages/org.eclipse.epp.package.classic/disabled_book.css1
-rw-r--r--packages/org.eclipse.epp.package.classic/eclipse.gifbin1052 -> 0 bytes
-rw-r--r--packages/org.eclipse.epp.package.classic/helpData.xml10
-rw-r--r--packages/org.eclipse.epp.package.classic/introData.xml57
-rw-r--r--packages/org.eclipse.epp.package.classic/macosx_narrow_book.css1
-rw-r--r--packages/org.eclipse.epp.package.classic/narrow_book.css1
-rw-r--r--packages/org.eclipse.epp.package.classic/plugin.properties1
-rw-r--r--packages/org.eclipse.epp.package.classic/plugin.xml14
-rw-r--r--packages/org.eclipse.epp.package.classic/plugin_customization.ini5
-rw-r--r--packages/org.eclipse.epp.package.classic/plugin_customization.properties14
14 files changed, 238 insertions, 20 deletions
diff --git a/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF
index e5b0a9fa..cfcc720d 100644
--- a/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.platform,
org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide.application;bundle-version="[1.0.0,2.0.0)"
-Eclipse-AutoStart: true
+Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.classic/about.properties b/packages/org.eclipse.epp.package.classic/about.properties
index 1cc264b7..cf46643e 100644
--- a/packages/org.eclipse.epp.package.classic/about.properties
+++ b/packages/org.eclipse.epp.package.classic/about.properties
@@ -22,7 +22,7 @@ Version: {featureVersion}\n\
Build id: {0}\n\
\n\
(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.\n\
-Visit http://www.eclipse.org/platform\n\
+Visit http://www.eclipse.org/eclipse\n\
\n\
This product includes software developed by the\n\
Apache Software Foundation http://www.apache.org/
diff --git a/packages/org.eclipse.epp.package.classic/book.css b/packages/org.eclipse.epp.package.classic/book.css
new file mode 100644
index 00000000..b337d94c
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/book.css
@@ -0,0 +1,116 @@
+P.Code {
+ display: block;
+ text-align: left;
+ text-indent: 0.00pt;
+ margin-top: 0.000000pt;
+ margin-bottom: 0.000000pt;
+ margin-right: 0.000000pt;
+ margin-left: 15pt;
+ font-weight: normal;
+ font-style: normal;
+ color: #4444CC;
+ text-decoration: none;
+ vertical-align: baseline;
+ text-transform: none;
+ font-family: "Courier New", Courier, monospace;
+}
+H6.CaptionFigColumn {
+ display: block;
+ text-align: left;
+ text-indent: 0.000000pt;
+ margin-top: 3.000000pt;
+ margin-bottom: 11.000000pt;
+ margin-right: 0.000000pt;
+ margin-left: 0.000000pt;
+ font-size: 75%;
+ font-weight: bold;
+ font-style: Italic;
+ color: #000000;
+ text-decoration: none;
+ vertical-align: baseline;
+ text-transform: none;
+}
+P.Note {
+ display: block;
+ text-align: left;
+ text-indent: 0pt;
+ margin-top: 19.500000pt;
+ margin-bottom: 19.500000pt;
+ margin-right: 0.000000pt;
+ margin-left: 30pt;
+ font-size: 110%;
+ font-weight: normal;
+ font-style: Italic;
+ color: #000000;
+ text-decoration: none;
+ vertical-align: baseline;
+ text-transform: none;
+}
+EM.UILabel {
+ font-weight: Bold;
+ font-style: normal;
+ text-decoration: none;
+ vertical-align: baseline;
+ text-transform: none;
+}
+EM.CodeName {
+ font-weight: Bold;
+ font-style: normal;
+ text-decoration: none;
+ vertical-align: baseline;
+ text-transform: none;
+ font-family: "Courier New", Courier, monospace;
+}
+UL.NavList {
+ margin-left: 1.5em;
+ padding-left: 0px;
+ list-style-type: none;
+}
+
+body, html { border: 0px }
+
+
+/* following font face declarations need to be removed for DBCS */
+
+body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
+pre, code, tt { font-family: "Courier New", Courier, monospace;}
+
+/* end font face declarations */
+
+@media print {
+ html { font-size: 12pt }
+}
+
+body { font-size: 83%; background: #FFFFFF; margin-bottom: 1em }
+h1 { font-size: 180%; margin-top: 5px; margin-bottom: 1px }
+h2 { font-size: 140%; margin-top: 25px; margin-bottom: 3px }
+h3 { font-size: 110%; margin-top: 20px; margin-bottom: 3px }
+h4 { font-size: 100%; margin-top: 20px; margin-bottom: 3px; font-style: italic }
+p { margin-top: 10px; margin-bottom: 10px }
+pre { font-size: 93%; margin-left: 6; color: #4444CC }
+code, tt { font-size: 93%; }
+table { font-size: 100% } /* needed for quirks mode */
+a:link { color: #0000FF }
+a:hover { color: #000080 }
+a:visited { text-decoration: underline }
+ul { margin-top: 10px; margin-bottom: 10px; }
+li { margin-top: 5px; margin-bottom: 5px; }
+li p { margin-top: 5px; margin-bottom: 5px; }
+ol { margin-top: 10px; margin-bottom: 10px; }
+dl { margin-top: 10px; margin-bottom: 10px; }
+dt { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }
+dd { margin-top: 5px; margin-bottom: 5px; }
+strong { font-weight: bold}
+em { font-style: italic}
+var { font-style: italic}
+div.revision { border-left-style: solid; border-left-width: thin;
+ border-left-color: #7B68EE; padding-left:5 }
+th { font-weight: bold }
+
+a.command-link {
+}
+a.command-link img {
+ border-width: 0px;
+ border-style: none;
+ vertical-align: middle;
+} \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.classic/build.properties b/packages/org.eclipse.epp.package.classic/build.properties
index e5748139..ec1b3c10 100644
--- a/packages/org.eclipse.epp.package.classic/build.properties
+++ b/packages/org.eclipse.epp.package.classic/build.properties
@@ -1,19 +1,25 @@
-bin.includes = META-INF/,\
- plugin_customization.ini,\
- plugin.xml,\
- about.html,\
- eclipse.gif,\
+bin.includes = about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
eclipse.png,\
- eclipse32.gif,\
+ eclipse16.png,\
eclipse32.png,\
- eclipse48.gif,\
eclipse48.png,\
- eclipse_lg.gif,\
- about.mappings,\
- intro-eclipse.png,\
- about.ini,\
- about.properties,\
eclipse256.png,\
- eclipse16.png,\
eclipse16.gif,\
- plugin.properties
+ eclipse32.gif,\
+ eclipse48.gif,\
+ eclipse_lg.gif,\
+ plugin.xml,\
+ plugin.properties,\
+ plugin_customization.ini,\
+ plugin_customization.properties,\
+ META-INF/,\
+ book.css,\
+ disabled_book.css,\
+ narrow_book.css,\
+ macosx_narrow_book.css,\
+ introData.xml,\
+ intro-eclipse.png,\
+ helpData.xml
diff --git a/packages/org.eclipse.epp.package.classic/disabled_book.css b/packages/org.eclipse.epp.package.classic/disabled_book.css
new file mode 100644
index 00000000..5abd0041
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/disabled_book.css
@@ -0,0 +1 @@
+/* This CSS is applied after all other CSSs for topics that belong to the disabled capabilities. The DIV for the notice injected at the top of the document is 'help-disabledTopic'. */ #help-disabledTopic { color: Highlight; font-weight: medium; margin-top: 1.0em; margin-bottom: 1.0em; } #help-disabledTopic hr { color: #C0C0C0; noshade; } \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.classic/eclipse.gif b/packages/org.eclipse.epp.package.classic/eclipse.gif
deleted file mode 100644
index 7d7e32b2..00000000
--- a/packages/org.eclipse.epp.package.classic/eclipse.gif
+++ /dev/null
Binary files differ
diff --git a/packages/org.eclipse.epp.package.classic/helpData.xml b/packages/org.eclipse.epp.package.classic/helpData.xml
new file mode 100644
index 00000000..0838605a
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/helpData.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extensions>
+ <tocOrder>
+ <toc id="/org.eclipse.platform.doc.user/toc.xml"/>
+ <toc id="/org.eclipse.jdt.doc.user/toc.xml"/>
+ <toc id="/org.eclipse.platform.doc.isv/toc.xml"/>
+ <toc id="/org.eclipse.jdt.doc.isv/toc.xml"/>
+ <toc id="/org.eclipse.pde.doc.user/toc.xml"/>
+ </tocOrder>
+</extensions>
diff --git a/packages/org.eclipse.epp.package.classic/introData.xml b/packages/org.eclipse.epp.package.classic/introData.xml
new file mode 100644
index 00000000..2b1c002b
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/introData.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extensions>
+ <page id="tutorials">
+ <group path="page-content/bottom-left" default="true">
+ </group>
+ <group path="page-content/bottom-right" default="true">
+ </group>
+ <group path="page-content/top-left">
+ <extension id="org.eclipse.jdt" importance="low"/>
+ <extension id="org.eclipse.team" importance="low"/>
+ </group>
+ <group path="page-content/top-right">
+ <extension id="org.eclipse.pde" importance="low"/>
+ </group>
+ </page>
+ <page id="whatsnew">
+ <group path="page-content/bottom-left" default="true">
+ </group>
+ <group path="page-content/bottom-right" default="true">
+ </group>
+ <group path="page-content/top-left">
+ <extension id="org.eclipse.ui.workbench.news" importance="low"/>
+ <extension id="org.eclipse.jdt" importance="low"/>
+ <extension id="org.eclipse.pde.changes" importance="low"/>
+ <extension id="org.eclipse.ui.workbench.migration" importance="callout"/>
+ </group>
+ <group path="page-content/top-right">
+ <extension id="org.eclipse.ui.workbench" importance="low"/>
+ </group>
+ </page>
+ <page id="samples">
+ <group path="page-content/bottom-left" default="true">
+ </group>
+ <group path="page-content/bottom-right" default="true">
+ </group>
+ <group path="page-content/top-left">
+ <extension id="org.eclipse.pde.workbench" importance="low"/>
+ </group>
+ <group path="page-content/top-right">
+ <extension id="org.eclipse.jdt" importance="low"/>
+ <extension id="org.eclipse.pde.swt" importance="low"/>
+ </group>
+ </page>
+ <page id="overview">
+ <group path="page-content/bottom-left" default="true">
+ </group>
+ <group path="page-content/bottom-right" default="true">
+ </group>
+ <group path="page-content/top-left">
+ <extension id="org.eclipse.ui.workbench" importance="low"/>
+ </group>
+ <group path="page-content/top-right">
+ <extension id="org.eclipse.jdt" importance="low"/>
+ <extension id="org.eclipse.pde" importance="low"/>
+ </group>
+ </page>
+</extensions>
diff --git a/packages/org.eclipse.epp.package.classic/macosx_narrow_book.css b/packages/org.eclipse.epp.package.classic/macosx_narrow_book.css
new file mode 100644
index 00000000..344e5e48
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/macosx_narrow_book.css
@@ -0,0 +1 @@
+h1,h2 { color: Black } \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.classic/narrow_book.css b/packages/org.eclipse.epp.package.classic/narrow_book.css
new file mode 100644
index 00000000..09a9aa1d
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/narrow_book.css
@@ -0,0 +1 @@
+P.Code { display: block; text-align: left; text-indent: 0.00pt; margin-top: 0.000000pt; margin-bottom: 0.000000pt; margin-right: 0.000000pt; margin-left: 1.5em; font-size: 100%; font-weight: medium; font-style: Regular; color: #4444CC; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Courier New"; } H6.CaptionFigColumn { display: block; text-align: left; text-indent: 0.000000pt; margin-top: 0.3em; margin-bottom: 1.1em; margin-right: 0.000000pt; margin-left: 0.000000pt; font-size: 90%; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } P.Note { display: block; text-align: left; text-indent: 0pt; margin-top: 1.95em; margin-bottom: 1.95em; margin-right: 0.000000pt; margin-left: 3.0em; font-size: 110%; font-weight: medium; font-style: Italic; color: #000000; text-decoration: none; vertical-align: baseline; text-transform: none; font-family: "Arial"; } EM.UILabel { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; } EM.CodeName { font-weight: Bold; font-style: Regular; text-decoration: none; vertical-align: baseline; text-transform: none; font-family:"Courier New"; } body, html { border: 0px } /* following font face declarations need to be removed for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font: message-box; color: #000000} pre { font-family: Courier, monospace} /* end font face declarations */ /* following font size declarations should be OK for DBCS */ body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font: message-box; } pre { font-size: 100% } code,samp { font-size: 100%; } /* end font size declarations */ body { background: #FFFFFF} h1 { font-size: 180%; font-weight: medium; margin-top: 0.28em; margin-bottom: 0.05em; color: Highlight } h2 { font-size: 140%; font-weight: bold; margin-top: 0.22em; margin-bottom: 3; color: Highlight } h3 { font-size: 110%; font-weight: bold; margin-top: 0.18em; margin-bottom: 3 } h4 { font-size: 100%; font-weight: bold; margin-top: 0.2em; margin-bottom: 3; font-style: italic } p { margin-top: 1.0em; margin-bottom: 1.0em } pre { margin-left: 6; font-size: 90% } a:link { color: #0000FF } a:hover { color: #000080 } a:visited { text-decoration: underline } ul { margin-top: 0; margin-bottom: 1.0em; margin-left : 1.0em; padding-left: 0; } li { margin-top: 0; margin-bottom: 0; padding-left: 0; margin-left: 0; } li p { margin-top: 0; margin-bottom: 0 } ol { margin-top: 0; margin-bottom: 10; padding-left: 0; margin-left: 1.4em } dl { margin-top: 0; margin-bottom: 10 } dt { margin-top: 0; margin-bottom: 0; font-weight: bold } dd { margin-top: 0; margin-bottom: 0 } strong { font-weight: bold} em { font-style: italic} var { font-style: italic} div.revision { border-left-style: solid; border-left-width: thin; border-left-color: #7B68EE; padding-left:5 } th { font-weight: bold } \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.classic/plugin.properties b/packages/org.eclipse.epp.package.classic/plugin.properties
index aca49685..d1e9fa14 100644
--- a/packages/org.eclipse.epp.package.classic/plugin.properties
+++ b/packages/org.eclipse.epp.package.classic/plugin.properties
@@ -54,6 +54,7 @@ is currently disabled. It may refer to user interface elements that are \
not visible.<br><br>\
To manually enable capabilities, use\
&nbsp;<a href='ACTIVITY_EDITOR'>Capabilities preference page.</a>
+helpActivitySupport.localScopeCheckbox = Show search hits from disabled capabilities
TriggerPointAdvisor.proceedMulti = Enable the selected capabilities?
TriggerPointAdvisor.proceedSingle = Enable the required capability?
diff --git a/packages/org.eclipse.epp.package.classic/plugin.xml b/packages/org.eclipse.epp.package.classic/plugin.xml
index c7dae930..949600d5 100644
--- a/packages/org.eclipse.epp.package.classic/plugin.xml
+++ b/packages/org.eclipse.epp.package.classic/plugin.xml
@@ -6,7 +6,8 @@
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
- name="%productName">
+ name="%productName"
+ description="%productBlurb">
<property
name="preferenceCustomization"
value="plugin_customization.ini">
@@ -283,6 +284,10 @@
activityId="org.eclipse.team.egit"
pattern="org\.eclipse\.egit\.core/.*GitProvider">
</activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.team.egit"
+ pattern="org\.eclipse\.egit\.doc/.*">
+ </activityPatternBinding>
<categoryActivityBinding
activityId="org.eclipse.team.egit"
categoryId="org.eclipse.categories.teamCategory">
@@ -333,7 +338,7 @@
<extension
point="org.eclipse.help.base.activitySupport">
- <support productId="org.eclipse.sdk.ide">
+ <support productId="org.eclipse.epp.package.classic.product">
<showAllMessage>
%helpActivitySupport.showAllMessage
</showAllMessage>
@@ -342,6 +347,9 @@
pluginId="org.eclipse.help.ui">
%helpActivitySupport.documentMessage
</documentMessage>
+ <localScopeCheckbox>
+ %helpActivitySupport.localScopeCheckbox
+ </localScopeCheckbox>
</support>
</extension>
@@ -361,7 +369,7 @@
<extension
point="org.eclipse.ui.activitySupport">
<triggerPointAdvisorProductBinding
- productId="org.eclipse.sdk.ide"
+ productId="org.eclipse.epp.package.classic.product"
triggerPointAdvisorId="org.eclipse.ui.ide.triggerPointAdvisor"/>
</extension>
diff --git a/packages/org.eclipse.epp.package.classic/plugin_customization.ini b/packages/org.eclipse.epp.package.classic/plugin_customization.ini
index 166ba084..eaf128d7 100644
--- a/packages/org.eclipse.epp.package.classic/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.classic/plugin_customization.ini
@@ -8,7 +8,7 @@
# Property "org.eclipse.ui/defaultPerspectiveId" controls the
# perspective that the workbench opens initially
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.pde.ui.PDEPerspective
+org.eclipse.ui/defaultPerspectiveId=org.eclipse.jdt.ui.JavaPerspective
# new-style tabs by default
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
@@ -36,5 +36,8 @@ org.eclipse.ui.intro.universal/INTRO_DATA = product:introData.xml
# Order help books in table of contents
org.eclipse.help/HELP_DATA = helpData.xml
+# enable doc filtering by capability
+org.eclipse.help.base/showDisabledActivityTopics=on
+
# lightweight auto-refresh on access by default (bug 384104)
org.eclipse.core.resources/refresh.lightweight.enabled=true
diff --git a/packages/org.eclipse.epp.package.classic/plugin_customization.properties b/packages/org.eclipse.epp.package.classic/plugin_customization.properties
new file mode 100644
index 00000000..4943101c
--- /dev/null
+++ b/packages/org.eclipse.epp.package.classic/plugin_customization.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2000, 2005 IBM Corporation 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# plugin_customization.properties
+# contains externalized strings for plugin_customization.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.

Back to the top