Skip to content

N
nexpie-grafana-theme
Commit 1f1244f2 by Torkel Ödegaard
Options

Upgrade Font-Awesome from 3.2 to 4.2

parent ffbbb5bc
Showing with 132 additions and 140 deletions
CHANGELOG.md
......@@ -8,6 +8,9 @@
- [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query
- [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold
**Tech**
- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2
# 1.9.1 (2014-12-29)
**Enhancements**
......
src/app/directives/panelMenu.js
......@@ -19,14 +19,14 @@ function (angular, $, _) {
var template = '<div class="panel-menu small">';
template += '<div class="panel-menu-inner">';
template += '<div class="panel-menu-row">';
template += '<a class="panel-menu-icon pull-left" ng-click="updateColumnSpan(-1)"><i class="icon-minus"></i></a>';
template += '<a class="panel-menu-icon pull-left" ng-click="updateColumnSpan(1)"><i class="icon-plus"></i></a>';
template += '<a class="panel-menu-icon pull-right" ng-click="remove_panel_from_row(row, panel)"><i class="icon-remove"></i></a>';
template += '<a class="panel-menu-icon pull-left" ng-click="updateColumnSpan(-1)"><i class="fa fa-minus"></i></a>';
template += '<a class="panel-menu-icon pull-left" ng-click="updateColumnSpan(1)"><i class="fa fa-plus"></i></a>';
template += '<a class="panel-menu-icon pull-right" ng-click="remove_panel_from_row(row, panel)"><i class="fa fa-remove"></i></a>';
template += '<div class="clearfix"></div>';
template += '</div>';
template += '<div class="panel-menu-row">';
template += '<a class="panel-menu-link" gf-dropdown="extendedMenu"><i class="icon-th-list"></i></a>';
template += '<a class="panel-menu-link" gf-dropdown="extendedMenu"><i class="fa fa-bars"></i></a>';
_.each($scope.panelMeta.menu, function(item) {
template += '<a class="panel-menu-link" ';
......
src/app/directives/tip.js
......@@ -11,7 +11,7 @@ function (angular, kbn) {
return {
restrict: 'E',
link: function(scope, elem, attrs) {
var _t = '<i class="grafana-tip icon-'+(attrs.icon||'question-sign')+'" bs-tooltip="\''+
var _t = '<i class="grafana-tip fa fa-'+(attrs.icon||'question-circle')+'" bs-tooltip="\''+
kbn.addslashes(elem.text())+'\'"></i>';
elem.replaceWith($compile(angular.element(_t))(scope));
}
......
src/app/features/annotations/partials/editor.html
......@@ -2,7 +2,7 @@
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-bolt"></i>
<i class="fa fa-bolt"></i>
Annotations
</div>
......@@ -22,20 +22,20 @@
<table class="grafana-options-table">
<tr ng-repeat="annotation in annotations">
<td style="width:90%">
<i class="icon-bolt"></i> &nbsp;
<i class="fa fa-bolt"></i> &nbsp;
{{annotation.name}}
</td>
<td style="width: 1%">
<a ng-click="edit(annotation)" class="btn btn-success btn-mini">
<i class="icon-edit"></i>
<i class="fa fa-edit"></i>
Edit
</a>
</td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td style="width: 1%">
<a ng-click="removeAnnotation(annotation)" class="btn btn-danger btn-mini">
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
......
src/app/features/graphite/addGraphiteFunc.js
......@@ -17,7 +17,7 @@ function (angular, app, _, $, gfunc) {
var buttonTemplate = '<a class="grafana-target-segment grafana-target-function dropdown-toggle"' +
' tabindex="1" gf-dropdown="functionMenu" data-toggle="dropdown"' +
' data-placement="top"><i class="icon-plus"></i></a>';
' data-placement="top"><i class="fa fa-plus"></i></a>';
return {
link: function($scope, elem) {
......
src/app/features/graphite/funcEditor.js
......@@ -16,10 +16,10 @@ function (angular, _, $) {
var funcControlsTemplate =
'<div class="graphite-func-controls">' +
'<span class="pointer icon-arrow-left"></span>' +
'<span class="pointer icon-info-sign"></span>' +
'<span class="pointer icon-remove" ></span>' +
'<span class="pointer icon-arrow-right"></span>' +
'<span class="pointer fa fa-arrow-left"></span>' +
'<span class="pointer fa fa-question-circle"></span>' +
'<span class="pointer fa fa-remove" ></span>' +
'<span class="pointer fa fa-arrow-right"></span>' +
'</div>';
return {
......@@ -195,7 +195,7 @@ function (angular, _, $) {
function registerFuncControlsActions() {
$funcControls.click(function(e) {
var $target = $(e.target);
if ($target.hasClass('icon-remove')) {
if ($target.hasClass('fa-remove')) {
toggleFuncControls();
$scope.$apply(function() {
$scope.removeFunction($scope.func);
......@@ -203,7 +203,7 @@ function (angular, _, $) {
return;
}
if ($target.hasClass('icon-arrow-left')) {
if ($target.hasClass('fa-arrow-left')) {
$scope.$apply(function() {
_.move($scope.functions, $scope.$index, $scope.$index - 1);
$scope.targetChanged();
......@@ -211,7 +211,7 @@ function (angular, _, $) {
return;
}
if ($target.hasClass('icon-arrow-right')) {
if ($target.hasClass('fa-arrow-right')) {
$scope.$apply(function() {
_.move($scope.functions, $scope.$index, $scope.$index + 1);
$scope.targetChanged();
......@@ -219,7 +219,7 @@ function (angular, _, $) {
return;
}
if ($target.hasClass('icon-info-sign')) {
if ($target.hasClass('fa-question-circle')) {
window.open("http://graphite.readthedocs.org/en/latest/functions.html#graphite.render.functions." + funcDef.name,'_blank');
return;
}
......
src/app/features/graphite/partials/query.editor.html
......@@ -10,19 +10,19 @@
<ul class="grafana-target-controls">
<li ng-show="parserError">
<a bs-tooltip="parserError" style="color: rgb(229, 189, 28)" role="menuitem">
<i class="icon icon-warning-sign"></i>
<i class="fa fa-warning"></i>
</a>
</li>
<li>
<a class="pointer" tabindex="1" ng-click="showTextEditor = !showTextEditor">
<i class="icon icon-pencil"></i>
<i class="fa fa-pencil"></i>
</a>
</li>
<li class="dropdown">
<a class="pointer dropdown-toggle"
data-toggle="dropdown"
tabindex="1">
<i class="icon icon-cog"></i>
<i class="fa fa-bars"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem">
......@@ -47,7 +47,7 @@
</li>
<li>
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="icon icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</li>
</ul>
......@@ -60,7 +60,7 @@
<a class="grafana-target-segment"
ng-click="target.hide = !target.hide; get_data();"
role="menuitem">
<i class="icon-eye-open"></i>
<i class="fa fa-eye"></i>
</a>
</li>
</ul>
......@@ -93,7 +93,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment grafana-target-segment-icon">
<i class="icon-wrench"></i>
<i class="fa fa-wrench"></i>
</li>
<li class="grafana-target-segment">
Cache timeout
......@@ -126,7 +126,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment grafana-target-segment-icon">
<i class="icon-info-sign"></i>
<i class="fa fa-info-circle"></i>
</li>
<li class="grafana-target-segment">
<a ng-click="toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
......
src/app/features/influxdb/partials/query.editor.html
......@@ -13,7 +13,7 @@
<a class="pointer dropdown-toggle"
data-toggle="dropdown"
tabindex="1">
<i class="icon icon-cog"></i>
<i class="fa fa-bars"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
......@@ -25,7 +25,7 @@
</li>
<li>
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="icon icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</li>
</ul>
......@@ -33,7 +33,7 @@
<ul class="grafana-segment-list">
<li>
<a class="grafana-target-segment" ng-click="target.hide = !target.hide; get_data();" role="menuitem">
<i class="icon-eye-open"></i>
<i class="fa fa-eye"></i>
</a>
</li>
</ul>
......@@ -89,7 +89,7 @@
<!-- Raw Query mode -->
<ul class="grafana-segment-list" ng-show="target.rawQuery">
<li class="grafana-target-segment">
<i class="icon-eye-open invisible"></i>
<i class="fa eye invisible"></i>
</li>
<li class="grafana-target-segment">
alias
......@@ -116,7 +116,7 @@
<!-- Query editor mode -->
<ul class="grafana-segment-list" role="menu" ng-hide="target.rawQuery">
<li class="grafana-target-segment">
<i class="icon-eye-open invisible"></i>
<i class="fa fa-eye invisible"></i>
</li>
<li class="grafana-target-segment">
select
......@@ -145,7 +145,7 @@
</li>
<li class="grafana-target-segment">
<i class="icon-plus"></i>
<i class="fa fa-plus"></i>
</li>
<li>
......@@ -184,7 +184,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment grafana-target-segment-icon">
<i class="icon-wrench"></i>
<i class="fa fa-wrench"></i>
</li>
<li class="grafana-target-segment">
group by time
......@@ -194,7 +194,7 @@
spellcheck='false' placeholder="example: >10s">
</li>
<li class="grafana-target-segment">
<i class="icon-question-sign" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>
......@@ -203,7 +203,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment grafana-target-segment-icon">
<i class="icon-info-sign"></i>
<i class="fa fa-info-circle"></i>
</li>
<li class="grafana-target-segment">
<a ng-click="toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
......
src/app/features/opentsdb/partials/query.editor.html
......@@ -12,7 +12,7 @@
<a class="pointer dropdown-toggle"
data-toggle="dropdown"
tabindex="1">
<i class="icon icon-cog"></i>
<i class="fa fa-bars"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem">
......@@ -25,7 +25,7 @@
</li>
<li>
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="icon icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</li>
</ul>
......@@ -35,7 +35,7 @@
<a class="grafana-target-segment"
ng-click="target.hide = !target.hide; get_data();"
role="menuitem">
<i class="icon-eye-open"></i>
<i class="fa fa-eye"></i>
</a>
</li>
</ul>
......@@ -54,7 +54,7 @@
<a bs-tooltip="target.errors.metric"
style="color: rgb(229, 189, 28)"
ng-show="target.errors.metric">
<i class="icon-warning-sign"></i>
<i class="fa fa-warning"></i>
</a>
</li>
<li class="grafana-target-segment">
......@@ -69,7 +69,7 @@
<a bs-tooltip="target.errors.aggregator"
style="color: rgb(229, 189, 28)"
ng-show="target.errors.aggregator">
<i class="icon-warning-sign"></i>
<i class="fa fa-warning"></i>
</a>
</li>
......@@ -174,13 +174,13 @@
<li ng-repeat="(key, value) in target.tags track by $index" class="grafana-target-segment">
{{key}}&nbsp;=&nbsp;{{value}}
<a ng-click="removeTag(key)">
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</li>
<li class="grafana-target-segment" ng-hide="addTagMode">
<a ng-click="addTag()">
<i class="icon-plus-sign"></i>
<i class="fa fa-plus"></i>
</a>
</li>
......@@ -200,12 +200,12 @@
ng-model="target.currentTagValue"
placeholder="value">
<a ng-click="addTag()">
<i class="icon-plus-sign"></i>
<i class="fa fa-plus"></i>
</a>
<a bs-tooltip="target.errors.tags"
style="color: rgb(229, 189, 28)"
ng-show="target.errors.tags">
<i class="icon-warning-sign"></i>
<i class="fa fa-warning"></i>
</a>
</li>
</ul>
......
src/app/features/panellinkeditor/module.html
......@@ -6,7 +6,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment">
<i class="icon-remove pointer" ng-click="deleteLink(link)"></i>
<i class="fa fa-remove pointer" ng-click="deleteLink(link)"></i>
</li>
<li class="grafana-target-segment">title</li>
......
src/app/panels/graph/axisEditor.html
......@@ -7,11 +7,11 @@
<select class="input-small" ng-model="panel.y_formats[0]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns', 'percent']" ng-change="render()"></select>
</div>
<div class="editor-option">
<label class="small">Min / <a ng-click="toggleGridMinMax('leftMin')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.leftMin)"></i></a></label>
<label class="small">Min / <a ng-click="toggleGridMinMax('leftMin')">Auto <i class="fa fa-star" ng-show="_.isNull(panel.grid.leftMin)"></i></a></label>
<input type="number" class="input-small" ng-model="panel.grid.leftMin" ng-change="render()" ng-model-onblur />
</div>
<div class="editor-option">
<label class="small">Max / <a ng-click="toggleGridMinMax('leftMax')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.leftMax)"></i></a></label>
<label class="small">Max / <a ng-click="toggleGridMinMax('leftMax')">Auto <i class="fa fa-star" ng-show="_.isNull(panel.grid.leftMax)"></i></a></label>
<input type="number" class="input-small" ng-model="panel.grid.leftMax" ng-change="render()" ng-model-onblur />
</div>
<div class="editor-option">
......@@ -26,11 +26,11 @@
<select class="input-small" ng-model="panel.y_formats[1]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns', 'percent']" ng-change="render()"></select>
</div>
<div class="editor-option">
<label class="small">Min / <a ng-click="toggleGridMinMax('rightMin')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.rightMin)"></i></a></label>
<label class="small">Min / <a ng-click="toggleGridMinMax('rightMin')">Auto <i class="fa fa-star" ng-show="_.isNull(panel.grid.rightMin)"></i></a></label>
<input type="number" class="input-small" ng-model="panel.grid.rightMin" ng-change="render()" ng-model-onblur />
</div>
<div class="editor-option">
<label class="small">Max / <a ng-click="toggleGridMinMax('rightMax')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.rightMax)"></i></a></label>
<label class="small">Max / <a ng-click="toggleGridMinMax('rightMax')">Auto <i class="fa fa-star" ng-show="_.isNull(panel.grid.rightMax)"></i></a></label>
<input type="number" class="input-small" ng-model="panel.grid.rightMax" ng-change="render()" ng-model-onblur />
</div>
</div>
......
src/app/panels/graph/legend.js
......@@ -78,7 +78,7 @@ function (angular, app, _, kbn, $) {
var html = '<th class="pointer" data-stat="' + statName + '">' + statName;
if (panel.legend.sort === statName) {
var cssClass = panel.legend.sortDesc ? 'icon-caret-down' : 'icon-caret-up' ;
var cssClass = panel.legend.sortDesc ? 'fa fa-caret-down' : 'fa-caret-up' ;
html += ' <span class="' + cssClass + '"></span>';
}
......@@ -136,7 +136,7 @@ function (angular, app, _, kbn, $) {
if (scope.hiddenSeries[series.alias]) { html += ' graph-legend-series-hidden'; }
html += '" data-series-index="' + i + '">';
html += '<div class="graph-legend-icon">';
html += '<i class="icon-minus pointer" style="color:' + series.color + '"></i>';
html += '<i class="fa fa-minus pointer" style="color:' + series.color + '"></i>';
html += '</div>';
html += '<div class="graph-legend-alias">';
......
src/app/panels/graph/legend.popover.html
......@@ -18,7 +18,7 @@
<div class="editor-row">
<i ng-repeat="color in colors"
class="pointer"
ng-class="{'icon-circle-blank': color === series.color,'icon-circle': color !== series.color}"
ng-class="{'fa fa-circle-o': color === series.color,'fa fa-circle': color !== series.color}"
ng-style="{color:color}"
ng-click="changeSeriesColor(series, color);dismiss();">&nbsp;</i>
</div>
......
src/app/panels/graph/module.html
......@@ -23,7 +23,7 @@
<div style="margin-top: 30px" ng-if="editMode">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-bar-chart"></i>
<i class="fa fa-bar-chart"></i>
Graph
</div>
......
src/app/panels/graph/styleEditor.html
......@@ -70,7 +70,7 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment">
<i class="icon-remove pointer" ng-click="removeSeriesOverride(override)"></i>
<i class="fa fa-remove pointer" ng-click="removeSeriesOverride(override)"></i>
</li>
<li class="grafana-target-segment">
......@@ -85,7 +85,7 @@
class="input-medium grafana-target-segment-input" >
</li>
<li class="grafana-target-segment" ng-repeat="option in currentOverrides">
<i class="pointer icon-remove" ng-click="removeOverride(option)"></i>
<i class="pointer fa fa-remove" ng-click="removeOverride(option)"></i>
{{option.name}}: {{option.value}}
</li>
......
src/app/panels/singlestat/editor.html
......@@ -86,14 +86,14 @@
<div class="grafana-target-inner">
<ul class="grafana-segment-list">
<li class="grafana-target-segment" ng-repeat-start="map in panel.valueMaps">
<i class="icon-remove pointer" ng-click="removeValueMap(map)"></i>
<i class="fa fa-remove pointer" ng-click="removeValueMap(map)"></i>
</li>
<li>
<input type="text" ng-model="map.value" placeholder="value" class="input-mini grafana-target-segment-input" ng-blur="render()">
</li>
<li class="grafana-target-segment">
<i class="icon-arrow-right"></i>
<i class="fa fa-arrow-right"></i>
</li>
<li ng-repeat-end>
<input type="text" placeholder="text" ng-model="map.text" class="input-mini grafana-target-segment-input" ng-blur="render()">
......@@ -101,7 +101,7 @@
<li>
<a class="pointer grafana-target-segment" ng-click="addValueMap();">
<i class="icon-plus"></i>
<i class="fa fa-plus"></i>
</a>
</li>
......
src/app/panels/singlestat/module.html
......@@ -7,7 +7,7 @@
<div style="margin-top: 30px" ng-if="editMode">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-dashboard"></i>
<i class="fa fa-dashboard"></i>
Singlestat
</div>
......
src/app/panels/timepicker/custom.html
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-calendar-empty"></i>
<i class="fa fa-clock-o"></i>
Custom time range
</div>
</div>
......@@ -56,7 +56,7 @@
<div class="timepicker-to-column">
<label class="small">To (<a class="link" ng-class="{'strong':temptime.now}" ng-click="setNow();temptime.now=true">now</a>)</label>
<label class="small">To (<a class="link" ng-class="{'strong':temptime.now}" ng-click="setNow();temptime.now=true">set now</a>)</label>
<div class="fake-input timepicker-input">
<div ng-hide="temptime.now">
......@@ -66,7 +66,7 @@
<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.second" required ng-pattern="patterns.second" onClick="this.select();"/>.
<input class="timepicker-ms" type="text" maxlength="3" ng-change="validate(temptime)" ng-model="temptime.to.millisecond" required ng-pattern="patterns.millisecond" onClick="this.select();"/>
</div>
<span type="text" ng-show="temptime.now" ng-disabled="temptime.now">&nbsp <i class="pointer icon-remove-sign" ng-click="setNow();temptime.now=false;"></i> Right Now <input type="text" name="dummy" style="visibility:hidden" /></span>
<span type="text" ng-show="temptime.now" ng-disabled="temptime.now">&nbsp <i class="pointer fa fa-remove" ng-click="setNow();temptime.now=false;"></i> Right Now <input type="text" name="dummy" style="visibility:hidden" /></span>
</div>
</div>
......
src/app/panels/timepicker/editor.html
......@@ -11,7 +11,7 @@
<p>
<br>
<i class="icon-info-sign"></i>
<i class="fa fa-info-circle"></i>
For these changes to fully take effect save and reload the dashboard.
</i>
</div>
......
src/app/panels/timepicker/module.html
......@@ -23,7 +23,7 @@
<a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="time.tooltip" data-placement="bottom" ng-click="dismiss();">
<span ng-bind="time.rangeString"></span>
<span ng-show="dashboard.refresh" class="text-warning">refreshed every {{dashboard.refresh}} </span>
<i class="icon-caret-down"></i>
<i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu">
......@@ -49,7 +49,7 @@
</li>
<li ng-show="!dashboard.refresh" class="grafana-menu-refresh">
<a ng-click="timeSrv.refreshDashboard()"><i class="icon-refresh"></i></a>
<a ng-click="timeSrv.refreshDashboard()"><i class="fa fa-refresh"></i></a>
</li>
</ul>
</form>
......
src/app/panels/timepicker/refreshctrl.html deleted 100644 → 0
<form name="refreshPopover" class='form-inline input-append' style="margin:0px">
<label><small>Interval (seconds)</small></label><br>
<input type="number" class="input-mini" ng-model="refresh_interval">
<button type="button" class="btn" ng-click="set_interval(refresh_interval);dismiss()"><i class="icon-ok"></i></button>
</form>
\ No newline at end of file
src/app/partials/confirm_modal.html
<div class="modal-body">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-ok"></i>
<i class="fa fa-check"></i>
{{title}}
</div>
</div>
......
src/app/partials/console.html
<div class="grafana-console" ng-controller="ConsoleCtrl">
<div class="grafana-console-header">
<span class="grafana-console-title large"><i class="icon-terminal"></i></span>
<span class="grafana-console-title large"><i class="fa fa-terminal"></i></span>
</div>
<div class="grafana-console-body">
<div class="grafana-console-item" ng-repeat="item in events" ng-class="{'grafana-console-error': item.error}">
......
src/app/partials/dashboard.html
......@@ -18,7 +18,7 @@
<div class="row-close" ng-show="row.collapse" data-placement="bottom" >
<div class="row-close-buttons">
<span class="row-button bgPrimary" ng-click="toggle_row(row)">
<i bs-tooltip="'Expand row'" data-placement="right" class="icon-caret-left pointer" ></i>
<i bs-tooltip="'Expand row'" data-placement="right" class="fa fa-caret-left pointer" ></i>
</span>
</div>
<div class="row-text pointer" ng-click="toggle_row(row)" ng-bind="row.title"></div>
......@@ -26,7 +26,7 @@
<div class="row-open" ng-show="!row.collapse">
<div class='row-tab bgSuccess dropdown' ng-show="row.editable">
<span class="row-tab-button dropdown-toggle" data-toggle="dropdown">
<i class="icon-th-list"></i>
<i class="fa fa-bars"></i>
</span>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="drop1">
<li>
......@@ -105,7 +105,7 @@
<div ng-show='dashboard.editable' class="row-fluid add-row-panel-hint">
<div class="span12" style="text-align:right;">
<span style="margin-right: 10px;" ng-click="add_row_default()" class="pointer btn btn-info btn-mini">
<span><i class="icon-plus-sign"></i> ADD A ROW</span>
<span><i class="fa fa-plus"></i> ADD ROW</span>
</span>
</div>
</div>
......
src/app/partials/dashboard_topnav.html
......@@ -20,14 +20,14 @@
<li class="dropdown grafana-menu-save">
<a bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
<i class='icon-save'></i>
<i class='fa fa-save'></i>
</a>
<ul class="save-dashboard-dropdown dropdown-menu" ng-if="saveDropdownOpened">
<li>
<form class="input-prepend nomargin save-dashboard-dropdown-save-form">
<input class='input-medium' ng-model="dashboard.title" type="text" />
<button class="btn" ng-click="saveDashboard()"><i class="icon-save"></i></button>
<button class="btn" ng-click="saveDashboard()"><i class="fa fa-save"></i></button>
</form>
</li>
......@@ -58,14 +58,14 @@
</li>
<li class="dropdown grafana-menu-load">
<a bs-tooltip="'Search'" ng-click="openSearch()">
<i class='icon-folder-open'></i>
<a ng-click="openSearch()" bs-tooltip="'Search'" data-placement="bottom">
<i class='fa fa-folder-open'></i>
</a>
</li>
<li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='icon-home'></i></a></li>
<li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='fa fa-home'></i></a></li>
<li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" dash-editor-link="app/partials/dasheditor.html"><i class='icon-cog pointer'></i></a></li>
<li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" dash-editor-link="app/partials/dasheditor.html"><i class='fa fa-cog pointer'></i></a></li>
<li class="grafana-menu-stop-playlist hide">
<a class='small' ng-click='stopPlaylist(2)'>
......
src/app/partials/dasheditor.html
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-cogs"></i>
<i class="fa fa-cogs"></i>
Dashboard settings
</div>
......@@ -51,11 +51,11 @@
<td style="width: 97%">
{{row.title}}
</td>
<td><i ng-click="_.move(dashboard.rows,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
<td><i ng-click="_.move(dashboard.rows,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
<td><i ng-click="_.move(dashboard.rows,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td><i ng-click="_.move(dashboard.rows,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td>
<a ng-click="dashboard.rows = _.without(dashboard.rows,row)" class="btn btn-danger btn-mini">
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
......
src/app/partials/edit_json.html
......@@ -2,7 +2,7 @@
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-edit"></i>
<i class="fa fa-edit"></i>
JSON
</div>
</div>
......
src/app/partials/help_modal.html
<div class="modal-body">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-keyboard"></i>
<i class="fa fa-keyboard-o"></i>
Keyboard shutcuts
</div>
</div>
......
src/app/partials/inspector.html
<div class="modal-body" ng-controller="InspectCtrl" ng-init="init()">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-eye-open"></i>
<i class="fa fa-eye"></i>
Inspector
</div>
......
src/app/partials/paneleditor.html
<div bindonce class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-text-width"></i>
<i class="fa fa-text-width"></i>
<span bo-text="panel.type+' settings'"></span>
</div>
......
src/app/partials/playlist.html
<div ng-controller="PlaylistCtrl" ng-init="init()">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-play"></i>
<i class="fa fa-play"></i>
Start dashboard playlist
</div>
</div>
......@@ -26,19 +26,19 @@
<label for="dash-{{$index}}" class="cr1"></label>
</td>
<td style="text-align: center">
<i class="icon-remove pointer" ng-click="removeAsFavorite(dashboard)"></i>
<i class="fa fa-remove pointer" ng-click="removeAsFavorite(dashboard)"></i>
</td>
</tr>
<tr ng-hide="favDashboards.length">
<td colspan="3">
<i class="icon-warning"></i> No dashboards marked as favorites
<i class="fa fa-warning"></i> No dashboards marked as favorites
</td>
</tr>
</table>
</div>
<div class="editor-option">
<div class="span4">
<span><i class="icon-question-sign"></i>
<span><i class="fa fa-question-circle"></i>
dashboards available in the playlist are only the ones marked as favorites (stored in local browser storage).
to mark a dashboard as favorite, use save icon in the menu and in the dropdown select mark as favorite
<br/><br/>
......@@ -56,7 +56,7 @@
</div>
<div class="dashboard-editor-footer">
<button class="btn btn-success" ng-click="start();dismiss();"><i class="icon-play"></i> Start</button>
<button type="button" class="btn btn-success pull-right" ng-click="dismiss();"><i class="icon-ban-circle"></i> Close</button>
<button class="btn btn-success" ng-click="start();dismiss();"><i class="fa fa-play"></i> Start</button>
<button type="button" class="btn btn-success pull-right" ng-click="dismiss();">Close</button>
</div>
</div>
src/app/partials/roweditor.html
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-th-list"></i>
<i class="fa fa-th-list"></i>
Row settings
</div>
......@@ -38,11 +38,11 @@
<td style="width: 95%">{{panel.title}}</td>
<td>{{panel.type}}</td>
<td><select ng-hide="panel.sizeable == false" class="input-mini" style="margin-bottom: 0;" ng-model="panel.span" ng-options="size for size in [1,2,3,4,5,6,7,8,9,10,11,12]"></select></td>
<td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
<td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
<td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td>
<a ng-click="row.panels = _.without(row.panels,panel)" class="btn btn-danger btn-mini">
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
......
src/app/partials/search.html
......@@ -2,22 +2,22 @@
<div class="dashboard-editor-header">
<div class="dashboard-editor-title" style="border: 0; line-height: 41px;">
<i class="icon icon-search"></i>
<i class="fa fa-search"></i>
Search
</div>
<div class="grafana-search-panel">
<div class="search-field-wrapper">
<button class="btn btn-success pull-right" dash-editor-link="app/partials/playlist.html" editor-scope="isolated">
<i class="icon-play"></i>
<i class="fa fa-play"></i>
Playlist
</button>
<button class="btn btn-success pull-right" ng-click="toggleImport($event)">
<i class="icon-download-alt"></i>
<i class="fa fa-download"></i>
Import
</button>
<button class="btn btn-success pull-right" ng-click="newDashboard()">
<i class="icon-th-large"></i>
<i class="fa fa-th-large"></i>
New
</button>
<span style="position: relative;">
......@@ -38,7 +38,7 @@
ng-class="{'selected': $index === selectedIndex }"
ng-click="filterByTag(tag.term, $event)">
<a class="search-result-tag label label-tag" tag-color-from-name>
<i class="icon icon-tag"></i>
<i class="fa fa-tag"></i>
<span>{{tag.term}} &nbsp;({{tag.count}})</span>
</a>
</div>
......@@ -52,10 +52,10 @@
<div class="search-result-actions small">
<a ng-click="shareDashboard(row.id, row.id, $event)" config-modal="app/partials/dashLoaderShare.html">
<i class="icon-share"></i> share &nbsp;&nbsp;&nbsp;
<i class="fa fa-share"></i> share &nbsp;&nbsp;&nbsp;
</a>
<a ng-click="deleteDashboard(row, $event)">
<i class="icon-remove"></i> delete
<i class="fa fa-remove"></i> delete
</a>
</div>
......@@ -66,7 +66,7 @@
</div>
<a class="search-result-link">
<i class="icon icon-th-large"></i>
<i class="fa fa-th-large"></i>
<span bo-text="row.title"></span>
</a>
......
src/app/partials/share-panel.html
......@@ -2,7 +2,7 @@
<div class="modal-header">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-share"></i>
<i class="fa fa-share"></i>
Share
</div>
......
src/app/partials/submenu.html
......@@ -6,7 +6,7 @@
<li class="grafana-target-segment">
<div class="dropdown">
<a class="pointer" data-toggle="dropdown">
<i class="icon-cog"></i>
<i class="fa fa-cog"></i>
</a>
<ul class="dropdown-menu">
<li><a class="pointer" dash-editor-link="app/partials/templating_editor.html">Templating</a></li>
......@@ -30,7 +30,7 @@
<ul class="grafana-segment-list" ng-if="dashboard.annotations.enable">
<li ng-repeat="annotation in dashboard.annotations.list" class="grafana-target-segment annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
<a ng-click="disableAnnotation(annotation)">
<i class="annotation-color-icon icon-bolt"></i>
<i class="annotation-color-icon fa fa-bolt"></i>
{{annotation.name}}
</a>
</li>
......
src/app/partials/templating_editor.html
<div ng-controller="TemplateEditorCtrl" ng-init="init()"> <div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<i class="icon icon-code"></i>
<i class="fa fa-code"></i>
Templating
</div>
......@@ -32,15 +32,15 @@
</td>
<td style="width: 1%">
<a ng-click="edit(variable)" class="btn btn-success btn-mini">
<i class="icon-edit"></i>
<i class="fa fa-edit"></i>
Edit
</a>
</td>
<td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
<td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td style="width: 1%">
<a ng-click="removeVariable(variable)" class="btn btn-danger btn-mini">
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
......@@ -101,7 +101,7 @@
<div class="editor-option form-inline">
<label class="small">Variable values query</label>
<input type="text" class="input-xxlarge" ng-model='current.query' placeholder="apps.servers.*"></input>
<button class="btn btn-small btn-success" ng-click="runQuery()" bs-tooltip="'Execute query'" data-placement="right"><i class="icon-play"></i></button>
<button class="btn btn-small btn-success" ng-click="runQuery()" bs-tooltip="'Execute query'" data-placement="right"><i class="fa fa-play"></i></button>
</div>
</div>
......@@ -109,7 +109,7 @@
<div class="editor-option form-inline">
<label class="small">regex (optional, if you want to extract part of a series name or metric node segment)</label>
<input type="text" class="input-xxlarge" ng-model='current.regex' placeholder="/.*-(.*)-.*/"></input>
<button class="btn btn-small btn-success" ng-click="runQuery()" bs-tooltip="'execute query'" data-placement="right"><i class="icon-play"></i></button>
<button class="btn btn-small btn-success" ng-click="runQuery()" bs-tooltip="'execute query'" data-placement="right"><i class="fa fa-play"></i></button>
</div>
</div>
......@@ -151,13 +151,3 @@
</div>
</div>
<!-- <div class="span4"> -->
<!-- <tip class="info&#45;box"> -->
<!-- <i class="icon&#45;question&#45;sign"></i> -->
<!-- The templating feature in Grafana lets easily create and manage templated queries. Templated queries use [[replacement]] syntax -->
<!-- to replace a part of your metric key or query. By using this feature you can make your dashboards more generic. You can for example create -->
<!-- a query replacement for your cluster name or server name. Then use that replacement in your metric queries and change -->
<!-- it globably for all graphs on the dashboard. -->
<!-- <br/><br/> -->
<!-- </tip> -->
<!-- </div> -->
src/app/partials/unsaved-changes.html
......@@ -2,7 +2,7 @@
</div>
<div class="modal-body">
<h4 class="text-center"><i class="icon-warning-sign"></i> Unsaved changes</h4>
<h4 class="text-center"><i class="fa fa-warning"></i> Unsaved changes</h4>
<div class="row-fluid">
<span class="span3">
{{changes}}
......
src/css/less/grafana.less
......@@ -235,7 +235,7 @@ input[type=text].grafana-function-param-input {
white-space: nowrap;
}
.icon {
.fa {
position: relative;
top: 8px;
}
......@@ -295,17 +295,17 @@ select.grafana-target-segment-input {
display: none;
text-align: center;
.icon-arrow-left {
.fa-arrow-left {
float: left;
position: relative;
top: 2px;
}
.icon-arrow-right {
.fa-arrow-right {
float: right;
position: relative;
top: 2px;
}
.icon-remove {
.fa-remove {
margin-left: 10px;
}
}
......@@ -490,7 +490,7 @@ select.grafana-target-segment-input {
font-weight: normal;
line-height: 38px;
margin: 0;
.icon {
.fa {
padding: 0 8px 0 5px;
color: @textColor;
}
......
src/css/less/graph.less
......@@ -42,6 +42,12 @@
}
}
.graph-legend-icon .fa {
font-size: 135%;
position: relative;
top: 1px;
}
.graph-legend-series {
float: left;
white-space: nowrap;
......@@ -80,9 +86,8 @@
width: 5px;
padding: 0;
top: 0;
.icon-minus {
position: relative;
top: 2px;
.fa {
top: 4px;
}
}
......
src/css/less/search.less
......@@ -23,7 +23,7 @@
line-height: 28px;
.search-result-item:hover, .search-result-item.selected {
.search-result-link, .search-result-link > .icon {
.search-result-link, .search-result-link > .fa {
color: @grafanaListHighlight;
}
}
......@@ -37,7 +37,7 @@
.search-result-link {
color: @grafanaListMainLinkColor;
.icon {
.fa {
padding-right: 10px;
color: @grafanaListHighlightContrast;
}
......
src/font/fontawesome-webfont.svg → src/fonts/fontawesome-webfont.svg
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment