mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-23 03:18:59 +00:00
Merge pull request #1293 from uok/move-panels
Move panels to top of page (ref #1270)
This commit is contained in:
Audrius Butkevicius
commit
ae1d3b3dd3
172
gui/index.html
172
gui/index.html
@ -64,12 +64,12 @@
|
|||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
<!-- First row, only shown if necessary; Restart warning -->
|
<!-- Panel: Restart Needed -->
|
||||||
|
|
||||||
<div ng-if="!configInSync" class="row">
|
<div ng-if="!configInSync" class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="panel panel-warning">
|
<div class="panel panel-warning">
|
||||||
<div class="panel-heading"><h3 translate class="panel-title">Restart Needed</h3></div>
|
<div class="panel-heading"><h3 class="panel-title"><span class="glyphicon glyphicon-exclamation-sign"></span><span translate>Restart Needed</span></h3></div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<p translate>The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.</p>
|
<p translate>The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.</p>
|
||||||
</div>
|
</div>
|
||||||
@ -81,6 +81,90 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Panel: New Device -->
|
||||||
|
|
||||||
|
<div ng-repeat="(device, event) in deviceRejections" class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="panel panel-warning">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<h3 class="panel-title">
|
||||||
|
<identicon data-value="device"></identicon> <span translate>New Device</span>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<p>
|
||||||
|
<small>{{ event.time | date:"H:mm:ss" }}:</small>
|
||||||
|
<span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
|
||||||
|
Device {%device%} ({%address%}) wants to connect. Add new device?
|
||||||
|
<span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="panel-footer clearfix">
|
||||||
|
<div class="pull-right">
|
||||||
|
<button class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)"><span class="glyphicon glyphicon-ok"></span> <span translate>Add</span></button>
|
||||||
|
<button class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)"><span class="glyphicon glyphicon-remove"></span> <span translate>Ignore</span></button>
|
||||||
|
<button class="btn btn-sm btn-default" ng-click="dismissDeviceRejection(device)"><span class="glyphicon glyphicon-time"></span> <span translate>Later</span></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Panel: New Folder -->
|
||||||
|
|
||||||
|
<div ng-repeat="(key, event) in folderRejections" class="row reject">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="panel panel-warning">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<h3 class="panel-title"><span class="glyphicon glyphicon-hdd"></span>
|
||||||
|
<span translate ng-if="!folders[event.data.folder]">New Folder</span>
|
||||||
|
<span translate ng-if="folders[event.data.folder]">Share Folder</span>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<p>
|
||||||
|
<small>{{ event.time | date:"H:mm:ss" }}:</small>
|
||||||
|
<span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
|
||||||
|
{%device%} wants to share folder "{%folder%}".
|
||||||
|
</span>
|
||||||
|
<span translate ng-if="folders[event.data.folder]">Share this folder?</span>
|
||||||
|
<span translate ng-if="!folders[event.data.folder]">Add new folder?</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="panel-footer clearfix">
|
||||||
|
<div class="pull-right">
|
||||||
|
<button class="btn btn-sm btn-success" ng-click="addFolderAndShare(event.data.folder, event.data.device)" ng-if="!folders[event.data.folder]">
|
||||||
|
<span class="glyphicon glyphicon-ok"></span> <span translate>Add</span>
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(event.data.folder, event.data.device)" ng-if="folders[event.data.folder]">
|
||||||
|
<span class="glyphicon glyphicon-ok"></span> <span translate>Share</span>
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
|
||||||
|
<span class="glyphicon glyphicon-time"></span> <span translate>Later</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Panel: Notice -->
|
||||||
|
|
||||||
|
<div ng-if="errorList().length > 0" class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="panel panel-warning">
|
||||||
|
<div class="panel-heading"><h3 class="panel-title"><span class="glyphicon glyphicon-exclamation-sign"></span><span translate>Notice</span></h3></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<p ng-repeat="err in errorList()"><small>{{err.Time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.Error)}}</p>
|
||||||
|
</div>
|
||||||
|
<div class="panel-footer">
|
||||||
|
<button type="button" class="pull-right btn btn-sm btn-default" ng-click="clearErrors()"><span class="glyphicon glyphicon-ok"></span> <span translate>OK</span></button>
|
||||||
|
<div class="clearfix"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- First regular row -->
|
<!-- First regular row -->
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -317,90 +401,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div> <!-- /row -->
|
</div> <!-- /row -->
|
||||||
|
|
||||||
<!-- Device Rejections -->
|
|
||||||
|
|
||||||
<div ng-repeat="(device, event) in deviceRejections" class="row">
|
|
||||||
<div class="col-md-12">
|
|
||||||
<div class="panel panel-warning">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<h3 class="panel-title">
|
|
||||||
<identicon data-value="device"></identicon> <span translate>New Device</span>
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<p>
|
|
||||||
<small>{{ event.time | date:"H:mm:ss" }}:</small>
|
|
||||||
<span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
|
|
||||||
Device {%device%} ({%address%}) wants to connect. Add new device?
|
|
||||||
<span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="panel-footer clearfix">
|
|
||||||
<div class="pull-right">
|
|
||||||
<button class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)"><span class="glyphicon glyphicon-ok"></span> <span translate>Add</span></button>
|
|
||||||
<button class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)"><span class="glyphicon glyphicon-remove"></span> <span translate>Ignore</span></button>
|
|
||||||
<button class="btn btn-sm btn-default" ng-click="dismissDeviceRejection(device)"><span class="glyphicon glyphicon-time"></span> <span translate>Later</span></button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Folder Rejections -->
|
|
||||||
|
|
||||||
<div ng-repeat="(key, event) in folderRejections" class="row reject">
|
|
||||||
<div class="col-md-12">
|
|
||||||
<div class="panel panel-warning">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<h3 class="panel-title">
|
|
||||||
<span translate ng-if="!folders[event.data.folder]">New Folder</span>
|
|
||||||
<span translate ng-if="folders[event.data.folder]">Share Folder</span>
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<p>
|
|
||||||
<small>{{ event.time | date:"H:mm:ss" }}:</small>
|
|
||||||
<span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
|
|
||||||
{%device%} wants to share folder "{%folder%}".
|
|
||||||
</span>
|
|
||||||
<span translate ng-if="folders[event.data.folder]">Share this folder?</span>
|
|
||||||
<span translate ng-if="!folders[event.data.folder]">Add new folder?</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="panel-footer clearfix">
|
|
||||||
<div class="pull-right">
|
|
||||||
<button class="btn btn-sm btn-success" ng-click="addFolderAndShare(event.data.folder, event.data.device)" ng-if="!folders[event.data.folder]">
|
|
||||||
<span class="glyphicon glyphicon-ok"></span> <span translate>Add</span>
|
|
||||||
</button>
|
|
||||||
<button class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(event.data.folder, event.data.device)" ng-if="folders[event.data.folder]">
|
|
||||||
<span class="glyphicon glyphicon-ok"></span> <span translate>Share</span>
|
|
||||||
</button>
|
|
||||||
<button class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
|
|
||||||
<span class="glyphicon glyphicon-time"></span> <span translate>Later</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Errors -->
|
|
||||||
|
|
||||||
<div ng-if="errorList().length > 0" class="row">
|
|
||||||
<div class="col-md-12">
|
|
||||||
<div class="panel panel-warning">
|
|
||||||
<div class="panel-heading"><h3 class="panel-title"><span translate>Notice</span></h3></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<p ng-repeat="err in errorList()"><small>{{err.Time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.Error)}}</p>
|
|
||||||
</div>
|
|
||||||
<div class="panel-footer">
|
|
||||||
<button type="button" class="pull-right btn btn-sm btn-default" ng-click="clearErrors()"><span class="glyphicon glyphicon-ok"></span> <span translate>OK</span></button>
|
|
||||||
<div class="clearfix"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div> <!-- /container -->
|
</div> <!-- /container -->
|
||||||
|
|
||||||
<!-- Bottom bar -->
|
<!-- Bottom bar -->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user