diff --git a/package.json b/package.json index 8785632eaee..64e393616f6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "2.1.0-pre1", + "version": "2.0.3-pre1", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" diff --git a/public/app/routes/dashLoadControllers.js b/public/app/routes/dashLoadControllers.js index ee36ef72117..f85cee09d84 100644 --- a/public/app/routes/dashLoadControllers.js +++ b/public/app/routes/dashLoadControllers.js @@ -90,7 +90,7 @@ function (angular, _, kbn, moment, $) { } return result.data; },function() { - $scope.appEvent('alert-error', ["Dashboard load failed", "Could not load dashboards/"+file+". Please make sure it exists"]); + $scope.appEvent('alert-error', ["Dashboard load failed", "Could not load "+file+". Please make sure it exists"]); return false; }); }; diff --git a/public/app/services/alertSrv.js b/public/app/services/alertSrv.js index d38c1f4aecc..4a8ef273523 100644 --- a/public/app/services/alertSrv.js +++ b/public/app/services/alertSrv.js @@ -29,7 +29,7 @@ function (angular, _) { this.set = function(title,text,severity,timeout) { var newAlert = { title: title || '', - text: $sce.trustAsHtml(text || ''), + text: text || '', severity: severity || 'info', }; diff --git a/public/views/index.html b/public/views/index.html index d5dfab06a64..8fb4a93bba6 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -35,7 +35,7 @@
{{alert.title}}
-
+