JENKINS-47386 fix icon tooltips (#1650)

* add missing tooltip to the configure icon on the pipeline and rundetails screens * remove erroneous title tag from the favourite/remove favourite icon
jenkinsci · Feb 12, 2018 · 532b064 · 532b064
1 parent c953c3d
commit 532b064
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/blueocean-dashboard/src/main/js/components/PipelinePage.jsx b/blueocean-dashboard/src/main/js/components/PipelinePage.jsx
@@ -21,12 +21,17 @@ const RestPaths = Paths.rest;
 const classicConfigLink = (pipeline) => {
     let link = null;
     if (Security.permit(pipeline).configure()) {
-        link = <a href={buildClassicConfigUrl(pipeline)} target="_blank"><Icon size={24} icon="ActionSettings" style={{ verticalAlign: 'baseline' }} /></a>;
+        link = (
+            <a href={buildClassicConfigUrl(pipeline)} title={webTranslate('toast.configure', { defaultValue: 'Configure' })} target="_blank">
+                <Icon size={24} icon="ActionSettings" style={{ verticalAlign: 'baseline' }} />
+            </a>
+        );
     }
     return link;
 };
 
 const translate = i18nTranslator('blueocean-dashboard');
+const webTranslate = i18nTranslator('blueocean-web');
 
 @observer
 export class PipelinePage extends Component {

diff --git a/blueocean-dashboard/src/main/js/components/RunDetails.jsx b/blueocean-dashboard/src/main/js/components/RunDetails.jsx
@@ -32,7 +32,7 @@ const classicConfigLink = (pipeline) => {
     if (Security.permit(pipeline).configure()) {
         let url = buildClassicConfigUrl(pipeline);
         link = (
-            <a href={ url } target="_blank" style={ { height: '24px' } }>
+            <a href={ url } target="_blank" title={webTranslate('toast.configure', { defaultValue: 'Configure' })} style={ { height: '24px' } }>
                 <Icon size={ 24 } icon="ActionSettings" />
             </a>
         );

diff --git a/blueocean-web/src/main/resources/jenkins/plugins/blueocean/web/Messages.properties b/blueocean-web/src/main/resources/jenkins/plugins/blueocean/web/Messages.properties
@@ -15,6 +15,7 @@ toast.run.started=Started "{0}" #{1}
 toast.run.stopping=Stopping "{0}" #{1}...
 toast.stopping=Stopping...
 toast.stop=Stop
+toast.configure=Configure
 Connection.lost.message=Connection lost
 Connection.lost.activity=waiting
 Connection.ok.message=Connection ok

diff --git a/jenkins-design-language/src/js/components/favorite/Favorite.jsx b/jenkins-design-language/src/js/components/favorite/Favorite.jsx
@@ -50,7 +50,6 @@ function FavoriteStarSvg(checkedObj) {
             <svg className="star-icon" width="288" height="24" viewBox="0 0 288 24" xmlns="http://www.w3.org/2000/svg"
                 focusable="false"
             >
-                <title>stars for light background</title>
                 <g fill="none" fillRule="evenodd">
                     { /* this star is used for the default 'unchecked' state */ }
                     <path className="Favorite-fill star-empty" d="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71 4.04 4.38.38-3.32 2.88 1 4.28L12 15.4z"/>