root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity

fix: fixed links on new 404 page, fixes #9493

This commit is contained in:
Torkel Ödegaard 2017-10-12 15:26:49 +02:00
parent b5727949fd
commit e7b718ed7a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/controllers/error_ctrl.js
View File

@ -1,19 +1,21 @@
define([ define([
'angular', 'angular',
'app/core/config',
'../core_module', '../core_module',
], ],
function (angular, coreModule) { function (angular, config, coreModule) {
'use strict'; 'use strict';
coreModule.default.controller('ErrorCtrl', function($scope, contextSrv, navModelSrv) { coreModule.default.controller('ErrorCtrl', function($scope, contextSrv, navModelSrv) {
$scope.navModel = navModelSrv.getNotFoundNav(); $scope.navModel = navModelSrv.getNotFoundNav();
$scope.appSubUrl = config.appSubUrl;
var showSideMenu = contextSrv.sidemenu; var showSideMenu = contextSrv.sidemenu;
contextSrv.sidemenu = false; contextSrv.sidemenu = false;
$scope.$on('$destroy', function() { $scope.$on('$destroy', function() {
$scope.contextSrv.sidemenu = showSideMenu; contextSrv.sidemenu = showSideMenu;
}); });
}); });

4
public/app/partials/error.html
View File

@ -42,8 +42,8 @@
</div> </div>
<div> <div>
<h3>Sorry for the inconvenience</h3> <h3>Sorry for the inconvenience</h3>
<p>Please go back to your <a href="#" class="error-link">home dashboard</a> and try again.</p> <p>Please go back to your <a href="{{appSubUrl}}/" class="error-link">home dashboard</a> and try again.</p>
<p>If the error persists, seek help on the <a href="#" class="error-link">community site</a>.</p> <p>If the error persists, seek help on the <a href="https://community.grafana.com" target="_blank" class="error-link">community site</a>.</p>
</div> </div>
</div> </div>
</div> </div>

2
public/sass/pages/_errorpage.scss
View File

@ -43,7 +43,7 @@
line-height: 1rem; line-height: 1rem;
} }
.error-link {color: $yellow;} .error-link {color: $orange;}
.error-minus { .error-minus {
color: #7eb26d; color: #7eb26d;

2
tslint.json
View File

@ -2,8 +2,8 @@
"rules": { "rules": {
"no-string-throw": true, "no-string-throw": true,
"no-unused-expression": true, "no-unused-expression": true,
"no-duplicate-variable": true,
"no-unused-variable": true, "no-unused-variable": true,
"no-duplicate-variable": true,
"curly": true, "curly": true,
"class-name": true, "class-name": true,
"semicolon": [true, "always", "ignore-bound-class-methods"], "semicolon": [true, "always", "ignore-bound-class-methods"],