opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 18:52:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update navbar and elements on playlist snapshots and change apps to plugins

Browse Source
This commit is contained in:
Trent White
2016-02-12 17:20:58 -05:00
parent b369b7e495
commit f98dbd249e
9 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/apps/partials/edit.html
View File

@ -1,4 +1,4 @@
<navbar title="Apps" title-url="apps" icon="icon-gf icon-gf-apps" subnav="true"> <navbar title="Plugins" title-url="Plugins" icon="icon-gf icon-gf-apps" subnav="true">
<ul class="nav"> <ul class="nav">
<li class="active" ><a href="apps/edit/{{ctrl.current.type}}">{{ctrl.appModel.name}}</a></li> <li class="active" ><a href="apps/edit/{{ctrl.current.type}}">{{ctrl.appModel.name}}</a></li>
</ul> </ul>

4
public/app/features/apps/partials/list.html
View File

@ -1,9 +1,9 @@
<navbar title="Apps" icon="icon-gf icon-gf-apps"> <navbar title="Plugins" icon="icon-gf icon-gf-apps">
</navbar> </navbar>
<div class="page-container"> <div class="page-container">
<div class="page-wide"> <div class="page-wide">
<h1>Apps</h1> <h1>Plugins</h1>
<div ng-if="!ctrl.apps"> <div ng-if="!ctrl.apps">
<em>No apps defined</em> <em>No apps defined</em>

4
public/app/features/dashboard/partials/saveDashboardAs.html
View File

@ -18,8 +18,8 @@
<br> <br>
<br> <br>
<button class="btn btn-inverse" ng-click="dismiss();">Cancel</button> <a class="btn btn-success" ng-click="saveClone();">Save</a>
<button class="btn btn-success" ng-click="saveClone();">Save</button> <a class="btn-text" ng-click="dismiss();">Cancel</a>
</div> </div>
</div> </div>
</div> </div>

2
public/app/features/datasources/partials/edit.html
View File

@ -65,7 +65,7 @@
<div class="" style="margin-top: 35px"> <div class="" style="margin-top: 35px">
<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button> <button type="submit" class="btn btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button> <button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
<button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)"> <button type="submit" class="btn btn-primary" ng-show="!isNew" ng-click="saveChanges(true)">
Test Connection Test Connection
</button> </button>
<a class="btn-text" href="datasources">Cancel</a> <a class="btn-text" href="datasources">Cancel</a>

45
public/app/features/playlist/partials/playlist.html
View File

@ -1,37 +1,46 @@
<navbar title="Playlists" title-url="playlists" icon="fa fa-fw fa-list" subnav="true"> <navbar>
<div class="top-nav-btn dashnav-dashboards-btn" >
<a class="pointer" ng-click="openSearch()">
<i class="fa fa-fw fa-list"></i>
<span class="dashboard-title">Playlist</span>
<i class="fa fa-caret-down"></i>
</a>
</div>
</navbar>
<!-- <navbar title="Playlists" title-url="playlists" icon="fa fa-fw fa-list" subnav="true">
<ul class="nav"> <ul class="nav">
<li ng-class="{active: ctrl.isNew()}" ng-show="ctrl.isNew()"><a href="datasources/create">New</a></li> <li ng-class="{active: ctrl.isNew()}" ng-show="ctrl.isNew()"><a href="datasources/create">New</a></li>
<li class="active" ng-show="!ctrl.isNew()"><a href="playlists/edit/{{ctrl.playlist.id}}">{{ctrl.playlist.name}}</a></li> <li class="active" ng-show="!ctrl.isNew()"><a href="playlists/edit/{{ctrl.playlist.id}}">{{ctrl.playlist.name}}</a></li>
</ul> </ul>
</navbar> </navbar> -->
<div class="page-container" ng-form="playlistEditForm"> <div class="page-container" ng-form="playlistEditForm">
<div class="page"> <div class="page">
<h2 ng-show="ctrl.isNew()">New playlist</h2> <h1 ng-show="ctrl.isNew()">New Playlist</h1>
<h2 ng-show="!ctrl.isNew()">Edit playlist</h2> <h1 ng-show="!ctrl.isNew()">Edit Playlist</h1>
<h4>Name and interval</h4> <h3>Name and interval</h3>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<div> <div>
<div class="tight-form"> <div class="norm-form">
<ul class="tight-form-list"> <ul class="norm-form-list">
<li class="tight-form-item" style="width: 100px"> <li class="norm-form-item" style="width: 100px">
Name Name
</li> </li>
<li> <li>
<input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge tight-form-input"> <input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge norm-form-input">
</li> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form last"> <div class="norm-form last">
<ul class="tight-form-list"> <ul class="norm-form-list">
<li class="tight-form-item" style="width: 100px"> <li class="norm-form-item" style="width: 100px">
Interval Interval
</li> </li>
<li> <li>
<input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge tight-form-input"> <input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge norm-form-input">
</li> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -116,14 +125,12 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="pull-left" style="margin-top: 25px;"> <div class="pull-left" style="margin-top: 25px;">
<!-- <div class="tight-form"> --> <!-- <div class="norm-form"> -->
<button type="button" <a
class="btn btn-success" class="btn btn-success"
ng-disabled="ctrl.playlistEditForm.$invalid || ctrl.isPlaylistEmpty()" ng-disabled="ctrl.playlistEditForm.$invalid || ctrl.isPlaylistEmpty()"
ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Save</button> ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Save</a>
<button type="button" <a class="btn-text" ng-click="ctrl.backToList()">Cancel</a>
class="btn btn-inverse"
ng-click="ctrl.backToList()">Cancel</button>
<!-- </div> --> <!-- </div> -->
</div> </div>

16
public/app/features/playlist/partials/playlists.html
View File

@ -1,14 +1,22 @@
<navbar icon="fa fa-fw fa-list" title="Playlists"></navbar> <navbar>
<div class="top-nav-btn dashnav-dashboards-btn" >
<a class="pointer" ng-click="openSearch()">
<i class="fa fa-fw fa-list"></i>
<span class="dashboard-title">New Playlist</span>
<i class="fa fa-caret-down"></i>
</a>
</div>
</navbar>
<div class="page-container"> <div class="page-container">
<div class="page-wide"> <div class="page-wide">
<a class="btn btn-inverse pull-right" href="playlists/create"> <a class="btn btn-success pull-right" href="playlists/create">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
New playlist New Playlist
</a> </a>
<h2>Saved playlists</h2> <h1>Saved playlists</h1>
<table class="filter-table" style="margin-top: 20px"> <table class="filter-table" style="margin-top: 20px">
<thead> <thead>

12
public/app/features/snapshot/partials/snapshots.html
View File

@ -1,9 +1,17 @@
<navbar icon="icon-gf icon-gf-snapshot" title="Dashboard snapshots"></navbar> <navbar>
<div class="top-nav-btn dashnav-dashboards-btn" >
<a class="pointer" ng-click="openSearch()">
<i class="icon-gf icon-gf-snapshot"></i>
<span class="dashboard-title">Snapshots</span>
<i class="fa fa-caret-down"></i>
</a>
</div>
</navbar>
<div class="page-container"> <div class="page-container">
<div class="page-wide"> <div class="page-wide">
<h2>Available snapshots</h2> <h1>Available snapshots</h1>
<table class="filter-table" style="margin-top: 20px"> <table class="filter-table" style="margin-top: 20px">
<thead> <thead>

2
public/less/playlist.less
View File

@ -1,5 +1,5 @@
.playlist-search-container { .playlist-search-container {
margin: 15px; // margin: 15px;
z-index: 1000; z-index: 1000;
position: relative; position: relative;
width: 700px; width: 700px;

1
public/vendor/bootstrap/less/mixins.less vendored
View File

@ -522,6 +522,7 @@
color: @textColor; color: @textColor;
background-color: @endColor; background-color: @endColor;
*background-color: darken(@endColor, 5%); *background-color: darken(@endColor, 5%);
box-shadow: inset 0 -3px rgba(0,0,0,0.3);
} }
// IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves