IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactorings and cleanup

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-02-03 20:38:13 +01:00
parent d7151e5c88
commit 0324de37d2
3 changed files with 67 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
public/app/features/dashboard/components/DashNav/DashNav.tsx
View File

@@ -135,61 +135,49 @@ export class DashNav extends PureComponent<Props> {
)}
{canStar && (
<button
className="btn navbar-button navbar-button--star"
<DashNavButton
tooltip="Mark as favorite"
classSuffix="star"
icon={`${isStarred ? 'fa fa-star' : 'fa fa-star-o'}`}
onClick={this.onStarDashboard}
title="Mark as favorite"
>
{isStarred && <i className="fa fa-star" />}
{!isStarred && <i className="fa fa-star-o" />}
</button>
/>
)}
{canShare && (
<button
className="btn navbar-button navbar-button--share"
<DashNavButton
tooltip="Share dashboard"
classSuffix="share"
icon="fa fa-share-square-o"
onClick={this.onOpenShare}
title="Share Dashboard"
>
<i className="fa fa-share-square-o" />
</button>
/>
)}
{canSave && (
<button
className="btn navbar-button navbar-button--save"
onClick={this.onSave}
title="Save dashboard <br> CTRL+S"
>
<i className="fa fa-save" />
</button>
<DashNavButton tooltip="Save dashboard" classSuffix="save" icon="fa fa-save" onClick={this.onSave} />
)}
{snapshotUrl && (
<a
className="btn navbar-button navbar-button--snapshot-origin"
<DashNavButton
tooltip="Open original dashboard"
classSuffix="snapshot-origin"
icon="fa fa-link"
href={snapshotUrl}
title="Open original dashboard"
>
<i className="fa fa-link" />
</a>
/>
)}
{showSettings && (
<button
className="btn navbar-button navbar-button--settings"
onClick={this.onOpenSettings}
title="Dashboard Settings"
>
<i className="fa fa-cog" />
</button>
<DashNavButton tooltip="Dashboard settings" classSuffix="settings" icon="fa fa-cog"
onClick={this.onOpenSettings} />
)}
</div>
<div className="navbar-buttons navbar-buttons--tv">
<button className="btn navbar-button navbar-button--tv" onClick={this.onToggleTVMode} title="Cycle view mode">
<i className="fa fa-desktop" />
</button>
<DashNavButton
tooltip="Cycke view mode"
classSuffix="tv"
icon="fa fa-desktop"
onClick={this.onToggleTVMode}
/>
</div>
{
@@ -198,13 +186,12 @@ export class DashNav extends PureComponent<Props> {
{(isFullscreen || editview) && (
<div className="navbar-buttons navbar-buttons--close">
<button
className="btn navbar-button navbar-button--primary"
<DashNavButton
tooltip="Back to dashboard"
classSuffix="primary"
icon="fa fa-reply"
onClick={this.onClose}
title="Back to dashboard"
>
<i className="fa fa-reply" />
</button>
/>
</div>
)}
</div>

21
public/app/features/dashboard/components/DashNav/DashNavButton.tsx
View File

@@ -8,15 +8,26 @@ interface Props {
icon: string;
tooltip: string;
classSuffix: string;
onClick: () => void;
onClick?: () => void;
href?: string;
}
export const DashNavButton: FunctionComponent<Props> = ({ icon, tooltip, classSuffix, onClick }) => {
export const DashNavButton: FunctionComponent<Props> = ({ icon, tooltip, classSuffix, onClick, href }) => {
if (onClick) {
return (
<Tooltip content={tooltip}>
<button className={`btn navbar-button navbar-button--${classSuffix}`} onClick={onClick}>
<i className={icon} />
</button>
</Tooltip>
);
}
return (
<Tooltip content={tooltip} placement="bottom">
<button className={`btn navbar-button navbar-button--${classSuffix}`} onClick={onClick}>
<Tooltip content={tooltip}>
<a className={`btn navbar-button navbar-button--${classSuffix}`} href={href}>
<i className={icon} />
</button>
</a>
</Tooltip>
);
};