IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 00:25:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1271_share_zero

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-03-22 18:31:37 +01:00
commit f04a5d7329
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/containers/ManageDashboards/FolderSettings.tsx
View File

@ -143,7 +143,7 @@ export class FolderSettings extends React.Component<IContainerProps, any> {
className="btn btn-success" className="btn btn-success"
disabled={!folder.folder.canSave || !folder.folder.hasChanged} disabled={!folder.folder.canSave || !folder.folder.hasChanged}
> >
<i className="fa fa-trash" /> Save <i className="fa fa-save" /> Save
</button> </button>
<button className="btn btn-danger" onClick={this.delete.bind(this)} disabled={!folder.folder.canSave}> <button className="btn btn-danger" onClick={this.delete.bind(this)} disabled={!folder.folder.canSave}>
<i className="fa fa-trash" /> Delete <i className="fa fa-trash" /> Delete

3
public/app/features/dashboard/partials/folder_settings.html
View File

@ -11,8 +11,7 @@
</div> </div>
<div class="gf-form-button-row"> <div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave || !ctrl.hasChanged"> <button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave || !ctrl.hasChanged">
<i class="fa fa-trash"></i> <i class="fa fa-save"></i>Save
Save
</button> </button>
<button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave"> <button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>