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

ux(modal): tight-form -> gf-form

Browse Source
This commit is contained in:
bergquist 2016-02-23 14:49:10 +01:00
parent 75454b02c0
commit c189c20164
2 changed files with 70 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
public/app/features/dashboard/partials/shareModal.html
View File

@ -35,53 +35,30 @@
<div ng-include src="'shareLinkOptions.html'"></div> <div ng-include src="'shareLinkOptions.html'"></div>
<div class="gf-form"> <div class="gf-form-group position-center">
<div class="gf-form-row"> <div class="gf-form width-30" >
<span class="gf-fluid-input"> <textarea rows="5" data-share-panel-url class="gf-form-input width-30" ng-model='iframeHtml'></textarea>
<textarea rows="5" data-share-panel-url class="input" ng-model='iframeHtml'></textarea> </div>
</span> </div>
<div class="gf-form-group">
<div class="gf-form position-center">
<button class="btn btn-inverse" data-clipboard-text="{{iframeHtml}}" clipboard-button><i class="fa fa-clipboard"></i> Copy</button>
</div> </div>
<button class="btn btn-inverse" data-clipboard-text="{{iframeHtml}}" clipboard-button><i class="fa fa-clipboard"></i> Copy</button>
</div> </div>
</script> </script>
<script type="text/ng-template" id="shareLinkOptions.html"> <script type="text/ng-template" id="shareLinkOptions.html">
<div class="editor-row" style="margin: 11px 20px 33px 20px"> <div class="gf-form-group position-center">
<div class="section"> <div class="gf-form">
<div class="tight-form"> <editor-checkbox text="Current time range" model="options.forCurrent" change="updated()"></editor-checkbox>
<ul class="tight-form-list"> </div>
<li class="tight-form-item" style="width: 170px;"> <div class="gf-form">
<label class="checkbox-label" for="options.forCurrent">Current time range</label> <editor-checkbox text="Include template variables" model="options.includeTemplateVars" change="updated()"></editor-checkbox>
</li> </div>
<li class="tight-form-item last"> <div class="gf-form">
<input class="cr1" id="options.forCurrent" type="checkbox" ng-model="options.forCurrent" ng-checked="options.forCurrent" ng-change="buildUrl()"> <span class="gf-form-label">Theme</span>
<label for="options.forCurrent" class="cr1"></label> <div class="gf-form-select-wrapper max-width-10">
</li> <select class="gf-form-input" ng-model="options.theme" ng-options="f as f for f in ['current', 'dark', 'light']" ng-change="buildUrl()"></select>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 170px">
<label class="checkbox-label" for="options.includeTemplateVars">Include template variables</label>
</li>
<li class="tight-form-item last">
<input class="cr1" id="options.includeTemplateVars" type="checkbox" ng-model="options.includeTemplateVars" ng-checked="options.includeTemplateVars" ng-change="buildUrl()">
<label for="options.includeTemplateVars" class="cr1"></label>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 170px">
Theme
</li>
<li>
<select class="input-small tight-form-input last" style="width: 211px" ng-model="options.theme" ng-options="f as f for f in ['current', 'dark', 'light']" ng-change="buildUrl()"></select>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
</div> </div>
@ -93,14 +70,19 @@
</div> </div>
<div ng-include src="'shareLinkOptions.html'"></div> <div ng-include src="'shareLinkOptions.html'"></div>
<div class="gf-form"> <div class="gf-form-group position-center">
<div class="gf-form-row"> <div class="gf-form-inline">
<button class="btn btn-inverse pull-right" data-clipboard-text="{{shareUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy</button>
<span class="gf-fluid-input"> <div class="gf-form width-30">
<input type="text" data-share-panel-url class="input" ng-model='shareUrl'></input> <input type="text" data-share-panel-url class="gf-form-input" ng-model="shareUrl"></input>
</span> </div>
<div class="gf-form pull-right">
<button class="btn btn-inverse pull-right" data-clipboard-text="{{shareUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy</button>
</div>
</div> </div>
<div class="editor-row" style="margin-top: 5px;" ng-show="modeSharePanel"> </div>
<div class="gf-form-group">
<div class="gf-form position-center" ng-show="modeSharePanel">
<a href="{{imageUrl}}" target="_blank"><i class="fa fa-camera"></i> Direct link rendered image</a> <a href="{{imageUrl}}" target="_blank"><i class="fa fa-camera"></i> Direct link rendered image</a>
</div> </div>
</div> </div>
@ -132,57 +114,44 @@
</p> </p>
</div> </div>
<div class="editor-row share-modal-options" style=""> <div class="gf-form-group share-modal-options position-center">
<div class="section" ng-if="step === 1"> <div class="gf-form" ng-if="step === 1">
<div class="tight-form"> <span class="gf-form-label width-12">Snapshot name</span>
<ul class="tight-form-list"> <input type="text" ng-model="snapshot.name" class="gf-form-input max-width-15" >
<li class="tight-form-item" style="width: 110px;"> </div>
Snapshot name <div class="gf-form">
</li> <span class="gf-form-label width-12">Expire</span>
<li> <div class="gf-form-select-wrapper max-width-15">
<input type="text" ng-model="snapshot.name" class="input-large tight-form-input last" > <select class="gf-form-input" ng-model="snapshot.expires" ng-options="f.value as f.text for f in expireOptions"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 110px">
Expire
</li>
<li>
<select class="input-small tight-form-input last" style="width: 211px" ng-model="snapshot.expires" ng-options="f.value as f.text for f in expireOptions"></select>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="gf-form" ng-if="step === 2" style="margin-top: 40px"> <div class="gf-form" ng-if="step === 2" style="margin-top: 40px">
<div class="gf-form-row"> <div class="gf-form-row">
<a href="{{snapshotUrl}}" class="large share-snapshot-link" target="_blank"> <a href="{{snapshotUrl}}" class="large share-snapshot-link" target="_blank">
<i class="fa fa-external-link-square"></i> <i class="fa fa-external-link-square"></i>
{{snapshotUrl}} {{snapshotUrl}}
</a> </a>
<br> <br>
<button class="btn btn-inverse btn-large" data-clipboard-text="{{snapshotUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy Link</button> <button class="btn btn-inverse btn-large" data-clipboard-text="{{snapshotUrl}}" clipboard-button><i class="fa fa-clipboard"></i> Copy Link</button>
</div>
</div> </div>
</div> </div>
</div>
<div ng-if="step === 1"> <div ng-if="step === 1" class="gf-form-buttons-row">
<button class="btn btn-success btn-large" ng-click="createSnapshot()" ng-disabled="loading"> <button class="btn btn-success btn-large" ng-click="createSnapshot()" ng-disabled="loading">
<i class="fa fa-save"></i> <i class="fa fa-save"></i>
Local Snapshot Local Snapshot
</button> </button>
<button class="btn btn-primary btn-large" ng-if="externalEnabled" ng-click="createSnapshot(true)" ng-disabled="loading"> <button class="btn btn-primary btn-large" ng-if="externalEnabled" ng-click="createSnapshot(true)" ng-disabled="loading">
<i class="fa fa-cloud-upload"></i> <i class="fa fa-cloud-upload"></i>
{{sharingButtonText}} {{sharingButtonText}}
</button> </button>
</div> </div>
<div class="pull-right" ng-if="step === 2" style="padding: 5px"> <div class="pull-right" ng-if="step === 2" style="padding: 5px">
Did you make a mistake? <a class="pointer" ng-click="deleteSnapshot()" target="_blank">delete snapshot.</a> Did you make a mistake? <a class="pointer" ng-click="deleteSnapshot()" target="_blank">delete snapshot.</a>
</div>
</div> </div>
</div> </div>

8
public/sass/components/_modals.scss
View File

@ -118,6 +118,8 @@
} }
.share-modal-big-icon { .share-modal-big-icon {
margin-bottom: 2rem;
.fa, .icon-gf { .fa, .icon-gf {
font-size: 70px; font-size: 70px;
} }
@ -147,3 +149,9 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
.modal-body {
.position-center {
display: inline-block;
}
}