replace the "Resources" text with "Support"

update the document icon
Merge remote-tracking branch 'origin/master' into jzhang/TUP-32897
2021-10-18 18:12:21 +08:00 · 2021-10-18 16:59:56 +08:00 · 2021-10-18 16:37:29 +08:00 · 2021-10-14 11:01:01 +08:00 · 2021-10-14 10:50:14 +08:00 · 2021-10-12 15:49:13 +08:00
4 changed files with 34 additions and 8 deletions
--- a/main/plugins/org.talend.rcp/icons/document.png
+++ b/main/plugins/org.talend.rcp/icons/document.png
--- a/main/plugins/org.talend.rcp/plugin.properties
+++ b/main/plugins/org.talend.rcp/plugin.properties
@@ -1,10 +1,13 @@
-resources.label = Resources
-Learn=Learn
+resources.label = Support
+resources.tip = Access help topics and resources
+Learn=Academy
+Documentation=Documentation
 Ask=Ask
 Exchange=Exchange
 Videos=Videos
 Cloud=Cloud
-LinksToolbarItem_Learn=Talend Help Center - Online Doc and Knowledge Base
+LinksToolbarItem_Learn=On-demand Training and Certification
+LinksToolbarItem_Documentation=Talend Help Center - Online Doc and Knowledge Base
 LinksToolbarItem_7=Ask questions and features
 LinksToolbarItem_exchange=Link to Talend Exchange
 LinksToolbarItem_videos=Link to Talend Guided Tutorials
--- a/main/plugins/org.talend.rcp/plugin.xml
+++ b/main/plugins/org.talend.rcp/plugin.xml
@@ -380,6 +380,10 @@
 			name="%Learn" 
 			id="org.talend.resoruses.toolbar.Learn">
 		</command>
+		<command 
+            name="%Documentation" 
+            id="org.talend.resoruses.toolbar.Documentation">
+        </command>
 		<command 
 			name="%Ask" 
 			id="org.talend.resoruses.toolbar.Ask">
@@ -409,6 +413,10 @@
         class="org.talend.rcp.action.toolbar.ResourceToolbarHandler"
         commandId="org.talend.resoruses.toolbar.Learn">
   </handler>
+   <handler
+         class="org.talend.rcp.action.toolbar.ResourceToolbarHandler"
+         commandId="org.talend.resoruses.toolbar.Documentation">
+   </handler>
   <handler
         class="org.talend.rcp.action.toolbar.ResourceToolbarHandler"
         commandId="org.talend.resoruses.toolbar.Ask">
@@ -453,7 +461,7 @@
          commandId="org.talend.resoruses.toolbar.referenceCommand" 
          label="%resources.label" 
          mode="FORCE_TEXT" 
-          tooltip="%resources.label" 
+          tooltip="%resources.tip" 
          style="pulldown"> 
        <visibleWhen> 
          <with variable="ResourceToolbarProvider.showToolbar"> 
@@ -469,7 +477,7 @@
          commandId="org.talend.resoruses.toolbar.referenceCommand" 
          label="%resources.label" 
          mode="FORCE_TEXT" 
-          tooltip="%resources.label" 
+          tooltip="%resources.tip" 
          style="pulldown"> 
            <visibleWhen> 
              <with variable="ResourceToolbarProvider.showToolbar"> 
@@ -487,7 +495,15 @@
        style="push" 
        mode="FORCE_TEXT" 
        tooltip="%LinksToolbarItem_Learn">
-    </command>  
+    </command>
+    <command 
+        commandId="org.talend.resoruses.toolbar.Documentation" 
+        icon="icons/document.png" 
+        label="%Documentation" 
+        style="push" 
+        mode="FORCE_TEXT" 
+        tooltip="%LinksToolbarItem_Documentation">
+    </command>   
    <command 
        commandId="org.talend.resoruses.toolbar.Ask" 
        icon="icons/irc_protocol.png" 
--- a/main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/action/toolbar/ResourceToolbarHandler.java
+++ b/main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/action/toolbar/ResourceToolbarHandler.java
@@ -18,7 +18,11 @@ public class ResourceToolbarHandler extends AbstractHandler {

    public static final String LEARN = "Learn"; //$NON-NLS-1$

-    public static final String LEARN_ORIG_URL = "https://help.talend.com";//$NON-NLS-1$
+    public static final String LEARN_ORIG_URL = "https://www.talend.com/academy";//$NON-NLS-1$
+    
+    public static final String DOCUMENTATION = "Documentation";//$NON-NLS-1$
+    
+    public static final String DOCUMENTATION_ORIG_URL = "https://help.talend.com";//$NON-NLS-1$

    public static final String ASK = "Ask"; //$NON-NLS-1$

@@ -34,7 +38,7 @@ public class ResourceToolbarHandler extends AbstractHandler {

    public static final String CLOUD = "Cloud"; //$NON-NLS-1$

-    public static final String CLOUD_ORIG_URL = "https://iam.integrationcloud.talend.com/idp/trial-registration?utm_medium=studio&utm_source=toolbar&utm_campaign=dynamic_acronym";//$NON-NLS-1$
+    public static final String CLOUD_ORIG_URL = "https://www.talend.com/free-trial";//$NON-NLS-1$

    @Override
    public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -42,6 +46,9 @@ public class ResourceToolbarHandler extends AbstractHandler {
        if (StringUtils.equals(id, "org.talend.resoruses.toolbar.Learn")) {//$NON-NLS-1$
            openBrower(LEARN_ORIG_URL);
        }
+        if (StringUtils.equals(id, "org.talend.resoruses.toolbar.Documentation")) {//$NON-NLS-1$
+            openBrower(DOCUMENTATION_ORIG_URL);
+        }
        if (StringUtils.equals(id, "org.talend.resoruses.toolbar.Ask")) {//$NON-NLS-1$
            openBrower(ASK_ORIG_URL);
        }
Author	SHA1	Message	Date
jiezhang-tlnd	b0c1cf1753	replace the "Resources" text with "Support"	2021-10-18 18:12:21 +08:00
jiezhang-tlnd	270d24ae89	update the document icon	2021-10-18 16:59:56 +08:00
jiezhang-tlnd	23f49a76e3	Merge remote-tracking branch 'origin/master' into jzhang/TUP-32897	2021-10-18 16:37:29 +08:00
jiezhang-tlnd	0a71d27520	update tooltip on the Resources button	2021-10-14 11:01:01 +08:00
jiezhang-tlnd	045d4362fa	Merge remote-tracking branch 'origin/master' into jzhang/TUP-32897	2021-10-14 10:50:14 +08:00
jiezhang-tlnd	75bb8c876b	fix(TUP-32897)Add Academy link to Resources toolbar	2021-10-12 15:49:13 +08:00