natel branding

NatelEnergy · May 6, 2019 · 59055ee · 59055ee
1 parent f8393fb
commit 59055ee
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 86 deletions.
diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html
@@ -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>
@@ -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>

diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
@@ -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, target: undefined };
+    const linkProps = { href: linkButton ? linkButton.href : '#', target: undefined };
 
     if (target) {
       linkProps.target = target;
@@ -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>
     );
   }

diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx
@@ -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}>
@@ -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} />)}
           </>

diff --git a/public/img/grafana_icon.svg b/public/img/grafana_icon.svg
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
@@ -41,7 +41,7 @@
   margin-right: auto;
   padding-left: $spacer * 2;
   padding-right: $spacer * 2;
-  max-width: 980px;
+  max-width: 100%;
   @include clearfix();
 }
 

diff --git a/public/views/index-template.html b/public/views/index-template.html
@@ -198,34 +198,14 @@
           <div class="text-center">
             <ul>
               <li>
-                <a href="http://docs.grafana.org" target="_blank">
+                <a href="https://upstream.tech/" target="_blank">
                   <i class="fa fa-file-code-o"></i>
-                  Docs
+                  Upstream Tech
                 </a>
               </li>
               <li>
-                <a href="https://grafana.com/services/support" target="_blank">
-                  <i class="fa fa-support"></i>
-                  Support Plans
-                </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>