Footer: Single footer component for both react & angular pages (#21389)

* Footer: Single footer implementation for both react & angular pages * Export type * Updates * Use footer links in help menu * Updates & Fixes * Updated snapshot * updated snapshot
2025-02-25 18:55:37 -06:00 · 2020-01-09 11:25:52 +01:00
parent 3866f609ce
commit 91ea3b15fa
40 changed files with 209 additions and 239 deletions
--- a/public/app/features/admin/StyleGuideCtrl.ts
+++ b/public/app/features/admin/StyleGuideCtrl.ts
@@ -1,29 +0,0 @@
-import config from 'app/core/config';
-import { BackendSrv } from 'app/core/services/backend_srv';
-import { NavModelSrv } from 'app/core/core';
-
-export default class StyleGuideCtrl {
-  theme: string;
-  buttonNames = ['primary', 'secondary', 'inverse', 'success', 'warning', 'danger'];
-  buttonSizes = ['btn-small', '', 'btn-large'];
-  buttonVariants = ['-'];
-  navModel: any;
-
-  /** @ngInject */
-  constructor(private $routeParams: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'styleguide', 0);
-    this.theme = config.bootData.user.lightTheme ? 'light' : 'dark';
-  }
-
-  switchTheme() {
-    this.$routeParams.theme = this.theme === 'dark' ? 'light' : 'dark';
-
-    const cmd = {
-      theme: this.$routeParams.theme,
-    };
-
-    this.backendSrv.put('/api/user/preferences', cmd).then(() => {
-      window.location.href = window.location.href;
-    });
-  }
-}
--- a/public/app/features/admin/snapshots/ServerStats.test.tsx.snap
+++ b/public/app/features/admin/snapshots/ServerStats.test.tsx.snap
@@ -159,14 +159,15 @@ exports[`ServerStats Should render table with stats 1`] = `
            <ul>
              <li>
                <a
-                  href="http://docs.grafana.org"
+                  href="https://grafana.com/docs/grafana/latest/?utm_source=grafana_footer"
                  rel="noopener"
                  target="_blank"
                >
                  <i
                    className="fa fa-file-code-o"
                  />
-                   Docs
+                   
+                  Docs
                </a>
              </li>
              <li>
@@ -178,19 +179,21 @@ exports[`ServerStats Should render table with stats 1`] = `
                  <i
                    className="fa fa-support"
                  />
-                   Support & Enterprise
+                   
+                  Support & Enterprise
                </a>
              </li>
              <li>
                <a
-                  href="https://community.grafana.com/"
+                  href="https://community.grafana.com/?utm_source=grafana_footer"
                  rel="noopener"
                  target="_blank"
                >
                  <i
                    className="fa fa-comments-o"
                  />
-                   Community
+                   
+                  Community
                </a>
              </li>
              <li>
@@ -199,16 +202,10 @@ exports[`ServerStats Should render table with stats 1`] = `
                  rel="noopener"
                  target="_blank"
                >
-                  Grafana
+                  <i />
+                   
+                  Grafana vv1.0 (commit: 1)
                </a>
-                 
-                <span>
-                  v
-                  v1.0
-                   (commit: 
-                  1
-                  )
-                </span>
              </li>
            </ul>
          </div>
--- a/public/app/features/admin/index.ts
+++ b/public/app/features/admin/index.ts
@@ -2,7 +2,6 @@ import AdminListUsersCtrl from './AdminListUsersCtrl';
 import AdminEditUserCtrl from './AdminEditUserCtrl';
 import AdminListOrgsCtrl from './AdminListOrgsCtrl';
 import AdminEditOrgCtrl from './AdminEditOrgCtrl';
-import StyleGuideCtrl from './StyleGuideCtrl';

 import coreModule from 'app/core/core_module';
 import { NavModelSrv } from 'app/core/core';
@@ -21,4 +20,3 @@ coreModule.controller('AdminEditUserCtrl', AdminEditUserCtrl);
 coreModule.controller('AdminListOrgsCtrl', AdminListOrgsCtrl);
 coreModule.controller('AdminEditOrgCtrl', AdminEditOrgCtrl);
 coreModule.controller('AdminHomeCtrl', AdminHomeCtrl);
-coreModule.controller('StyleGuideCtrl', StyleGuideCtrl);
--- a/public/app/features/admin/partials/admin_home.html
+++ b/public/app/features/admin/partials/admin_home.html
@@ -9,3 +9,4 @@

 </div>

+<footer />
--- a/public/app/features/admin/partials/edit_org.html
+++ b/public/app/features/admin/partials/edit_org.html
@@ -42,3 +42,5 @@
 		</tr>
 	</table>
 </div>
+
+<footer />
--- a/public/app/features/admin/partials/edit_user.html
+++ b/public/app/features/admin/partials/edit_user.html
@@ -181,3 +181,5 @@
    </div>
  </div>
 </div>
+
+<footer />
--- a/public/app/features/admin/partials/new_user.html
+++ b/public/app/features/admin/partials/new_user.html
@@ -28,3 +28,5 @@
 		</div>
 	</form>
 </div>
+
+<footer />
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -37,3 +37,5 @@
    </tbody>
  </table>
 </div>
+
+<footer />
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -76,3 +76,5 @@
    </ol>
  </div>
 </div>
+
+<footer />
--- a/public/app/features/alerting/partials/notification_edit.html
+++ b/public/app/features/alerting/partials/notification_edit.html
@@ -75,3 +75,5 @@
    </div>
  </form>
 </div>
+
+<footer />
--- a/public/app/features/alerting/partials/notifications_list.html
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -57,3 +57,5 @@
    />
  </div>
 </div>
+
+<footer />
--- a/public/app/features/folders/partials/create_folder.html
+++ b/public/app/features/folders/partials/create_folder.html
@@ -32,3 +32,5 @@
 	</form>

 </div>
+
+<footer />
--- a/public/app/features/folders/partials/folder_dashboards.html
+++ b/public/app/features/folders/partials/folder_dashboards.html
@@ -1,5 +1,7 @@
 <page-header ng-if="ctrl.navModel" model="ctrl.navModel"></page-header>

 <div class="page-container page-body">
-    <manage-dashboards ng-if="ctrl.folderId && ctrl.uid" folder-id="ctrl.folderId" folder-uid="ctrl.uid" />
+  <manage-dashboards ng-if="ctrl.folderId && ctrl.uid" folder-id="ctrl.folderId" folder-uid="ctrl.uid" />
 </div>
+
+<footer />
--- a/public/app/features/manage-dashboards/partials/dashboard_import.html
+++ b/public/app/features/manage-dashboards/partials/dashboard_import.html
@@ -157,3 +157,5 @@

  </div>
 </div>
+
+<footer />
--- a/public/app/features/manage-dashboards/partials/dashboard_list.html
+++ b/public/app/features/manage-dashboards/partials/dashboard_list.html
@@ -3,3 +3,5 @@
 <div class="page-container page-body">
  <manage-dashboards />
 </div>
+
+<footer />
--- a/public/app/features/manage-dashboards/partials/snapshot_list.html
+++ b/public/app/features/manage-dashboards/partials/snapshot_list.html
@@ -34,3 +34,5 @@
  </table>

 </div>
+
+<footer />
--- a/public/app/features/org/partials/newOrg.html
+++ b/public/app/features/org/partials/newOrg.html
@@ -20,3 +20,5 @@
 		</div>
 	</form>
 </div>
+
+<footer />
--- a/public/app/features/org/partials/select_org.html
+++ b/public/app/features/org/partials/select_org.html
@@ -24,3 +24,4 @@
 </div>


+<footer />
--- a/public/app/features/playlist/partials/playlist.html
+++ b/public/app/features/playlist/partials/playlist.html
@@ -100,3 +100,5 @@
 		<a class="btn-text" ng-click="ctrl.backToList()">Cancel</a>
 	</div>
 </div>
+
+<footer />
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -57,10 +57,12 @@
      title="'There are no playlists created yet'"
      buttonIcon="'fa fa-plus'"
      buttonLink="'playlists/create'"
-      buttonTitle="'Create Playlist'" 
+      buttonTitle="'Create Playlist'"
      proTip="'You can use playlists to cycle dashboards on TVs without user control'"
-      proTipLink="'http://docs.grafana.org/reference/playlist/'" 
+      proTipLink="'http://docs.grafana.org/reference/playlist/'"
      proTipLinkTitle="'Learn more'"
      proTipTarget="'_blank'" />
  </div>
 </div>
+
+<footer />
--- a/public/app/features/plugins/partials/plugin_page.html
+++ b/public/app/features/plugins/partials/plugin_page.html
@@ -8,3 +8,5 @@
    </div>
  </div>
 </div>
+
+<footer />
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -32,3 +32,5 @@
    </table>
  </div>
 </div>
+
+<footer />