Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use natel branding #5

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Use natel branding #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
59055ee
natel branding
ryantxu May 6, 2019
969e270
Merge branch 'master' into v6-branding
ryantxu May 10, 2019
899728c
merge master
ryantxu May 10, 2019
3242bab
put back the test
ryantxu May 10, 2019
e5c93e8
fix test
ryantxu May 10, 2019
272649f
update test
ryantxu May 11, 2019
04c57fe
upstream footer
ryantxu May 13, 2019
a8ed5d2
fix test
ryantxu May 13, 2019
39c96c2
Merge branch 'v6-branding' of github.com:natelenergy/grafana into v6-…
ryantxu May 13, 2019
51bb0ac
remove snapshots
ryantxu May 13, 2019
f986df1
remove snapshots
ryantxu May 13, 2019
d8d4859
merge master
ryantxu May 15, 2019
d6ed1a3
merge master
ryantxu May 15, 2019
8e95af2
Merge branch 'master' into v6-branding
ryantxu May 16, 2019
78d763a
Merge remote-tracking branch 'grafana/master' into v6-branding
ryantxu May 17, 2019
9aeebff
merge master
ryantxu May 17, 2019
94f89dd
merge master
ryantxu May 17, 2019
3c00ded
Merge branch 'master' into v6-branding
ryantxu May 17, 2019
1fb4f1c
fix extra quote
ryantxu May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emails/templates/layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<table class="twelve columns">
<tr>
<td class="twelve sub-columns center">
<img class="logo" src="http://grafana.org/assets/img/logo_new_transparent_200x48.png" style="width: 200px; float: none; display: inline">
<img class="logo" src="1hskmz3i2o5bhic6pojfb512.wpengine.netdna-cdn.com/wp-content/uploads/2016/10/Natel_Energy_logo_blue.png" style="width: 200px; float: none; display: inline">
</td>
<td class="expander"></td>
</tr>
Expand Down Expand Up @@ -143,7 +143,7 @@
<center>
<p style="text-align: center; font-size: 12px; color: #999999;">
Sent by <a href="[[.AppUrl]]">Grafana v[[.BuildVersion]]</a>
<br />&copy; 2018 Grafana Labs
<br />&copy; 2019 Natel Energy
</p>
</center>
</td>
Expand Down
31 changes: 4 additions & 27 deletions public/app/core/components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { FC } from 'react';
import { Tooltip } from '@grafana/ui';

interface Props {
appName: string;
Expand All @@ -16,37 +15,15 @@ export const Footer: FC<Props> = React.memo(
<div className="text-center">
<ul>
<li>
<a href="http://docs.grafana.org" target="_blank">
<i className="fa fa-file-code-o" /> Docs
<a href="https://upstream.tech/" target="_blank">
Upstream Tech
</a>
</li>
<li>
<a href="https://grafana.com/services/support" target="_blank">
<i className="fa fa-support" /> Support Plans
<a href="https://grafana.com" target="_blank" title={`(commit: ${buildCommit})`}>
v{buildVersion}
</a>
</li>
<li>
<a href="https://community.grafana.com/" target="_blank">
<i className="fa fa-comments-o" /> Community
</a>
</li>
<li>
<a href="https://grafana.com" target="_blank">
{appName}
</a>{' '}
<span>
v{buildVersion} (commit: {buildCommit})
</span>
</li>
{newGrafanaVersionExists && (
<li>
<Tooltip placement="auto" content={newGrafanaVersion}>
<a href="https://grafana.com/get" target="_blank">
New version available!
</a>
</Tooltip>
</li>
)}
</ul>
</div>
</footer>
Expand Down
10 changes: 6 additions & 4 deletions public/app/core/components/OrgActionBar/OrgActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface Props {
export default class OrgActionBar extends PureComponent<Props> {
render() {
const { searchQuery, layoutMode, onSetLayoutMode, linkButton, setSearchQuery, target } = this.props;
const linkProps = { href: linkButton.href };
const linkProps = { href: linkButton ? linkButton.href : '#' };

if (target) {
(linkProps as any).target = target;
Expand All @@ -33,9 +33,11 @@ export default class OrgActionBar extends PureComponent<Props> {
<LayoutSelector mode={layoutMode} onLayoutModeChanged={(mode: LayoutMode) => onSetLayoutMode(mode)} />
</div>
<div className="page-action-bar__spacer" />
<a className="btn btn-primary" {...linkProps}>
{linkButton.title}
</a>
{linkButton && (
<a className="btn btn-primary" {...linkProps}>
{linkButton.title}
</a>
)}
</div>
);
}
Expand Down
7 changes: 1 addition & 6 deletions public/app/features/plugins/PluginListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ export class PluginListPage extends PureComponent<Props> {
searchQuery,
} = this.props;

const linkButton = {
href: 'https://grafana.com/plugins?utm_source=grafana_plugin_list',
title: 'Find more plugins on Grafana.com',
};

return (
<Page navModel={navModel}>
<Page.Contents isLoading={!hasFetched}>
Expand All @@ -55,7 +50,7 @@ export class PluginListPage extends PureComponent<Props> {
layoutMode={layoutMode}
onSetLayoutMode={mode => setPluginsLayoutMode(mode)}
setSearchQuery={query => setPluginsSearchQuery(query)}
linkButton={linkButton}
linkButton={null}
/>
{hasFetched && plugins && (plugins && <PluginList plugins={plugins} layoutMode={layoutMode} />)}
</>
Expand Down
59 changes: 2 additions & 57 deletions public/img/grafana_icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/sass/layout/_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
margin-right: auto;
padding-left: $spacer * 2;
padding-right: $spacer * 2;
max-width: 980px;
max-width: 100%;
@include clearfix();
}

Expand Down
28 changes: 5 additions & 23 deletions public/views/index-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,34 +198,16 @@
<div class="text-center">
<ul>
<li>
<a href="http://docs.grafana.org" target="_blank">
<i class="fa fa-file-code-o"></i>
Docs
<a href="https://upstream.tech/" target="_blank">
Upstream Tech
</a>
</li>
<li>
<a href="https://grafana.com/services/support" target="_blank">
<i class="fa fa-support"></i>
Support Plans
<a href="https://grafana.com" target="_blank"
title="(commit: [[.BuildCommit]])">
v[[.BuildVersion]]
</a>
</li>
<li>
<a href="https://community.grafana.com/" target="_blank">
<i class="fa fa-comments-o"></i>
Community
</a>
</li>
<li>
<a href="https://grafana.com" target="_blank">[[.AppName]]</a>
<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
</li>
[[if .NewGrafanaVersionExists]]
<li>
<a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
New version available!
</a>
</li>
[[end]]
</ul>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion scripts/grunt/options/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(config, grunt) {
command: 'yarn run typecheck',
src: ['public/app/**/*.ts*'],
},
jest: 'node ./node_modules/jest-cli/bin/jest.js --maxWorkers 2',
jest: 'node ./node_modules/jest-cli/bin/jest.js --updateSnapshot --maxWorkers 2',
webpack:
'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js',
};
Expand Down