Merge branch 'pr/2594'
* pr/2594: Move event timestamp to header for share folder prompt Edit device after accepting new connection (fixes #1929) Move new device timestamp to box header Fix unmatching closing span tag
This commit is contained in:
commit
aeb3af7105
|
@ -121,21 +121,22 @@
|
||||||
<div class="panel panel-warning">
|
<div class="panel panel-warning">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h3 class="panel-title">
|
||||||
<identicon data-value="device"></identicon> <span translate>New Device</span>
|
<identicon data-value="device"></identicon>
|
||||||
|
<span translate>New Device</span>
|
||||||
|
<span class="pull-right">{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}</span>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<p>
|
<p>
|
||||||
<small>{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}:</small>
|
|
||||||
<span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
|
<span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
|
||||||
Device {%device%} ({%address%}) wants to connect. Add new device?
|
Device {%device%} ({%address%}) wants to connect. Add new device?
|
||||||
<span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-footer clearfix">
|
<div class="panel-footer clearfix">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<button type="button" class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)">
|
<button type="button" class="btn btn-sm btn-success" ng-click="addDevice(device)">
|
||||||
<span class="fa fa-check"></span> <span translate>Add</span>
|
<span class="fa fa-plus"></span> <span translate>Add Device</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)">
|
<button type="button" class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)">
|
||||||
<span class="fa fa-times"></span> <span translate>Ignore</span>
|
<span class="fa fa-times"></span> <span translate>Ignore</span>
|
||||||
|
@ -158,11 +159,11 @@
|
||||||
<h3 class="panel-title"><span class="fa fa-folder"></span>
|
<h3 class="panel-title"><span class="fa fa-folder"></span>
|
||||||
<span translate ng-if="!folders[event.data.folder]">New Folder</span>
|
<span translate ng-if="!folders[event.data.folder]">New Folder</span>
|
||||||
<span translate ng-if="folders[event.data.folder]">Share Folder</span>
|
<span translate ng-if="folders[event.data.folder]">Share Folder</span>
|
||||||
|
<span class="pull-right">{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}</span>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<p>
|
<p>
|
||||||
<small>{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}:</small>
|
|
||||||
<span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
|
<span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
|
||||||
{%device%} wants to share folder "{%folder%}".
|
{%device%} wants to share folder "{%folder%}".
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -970,13 +970,14 @@ angular.module('syncthing.core')
|
||||||
$('#idqr').modal('show');
|
$('#idqr').modal('show');
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.addDevice = function () {
|
$scope.addDevice = function (deviceID) {
|
||||||
$http.get(urlbase + '/system/discovery')
|
return $http.get(urlbase + '/system/discovery')
|
||||||
.success(function (registry) {
|
.success(function (registry) {
|
||||||
$scope.discovery = registry;
|
$scope.discovery = registry;
|
||||||
})
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
$scope.currentDevice = {
|
$scope.currentDevice = {
|
||||||
|
deviceID: deviceID,
|
||||||
_addressesStr: 'dynamic',
|
_addressesStr: 'dynamic',
|
||||||
compression: 'metadata',
|
compression: 'metadata',
|
||||||
introducer: false,
|
introducer: false,
|
||||||
|
@ -1016,18 +1017,7 @@ angular.module('syncthing.core')
|
||||||
$scope.saveDevice = function () {
|
$scope.saveDevice = function () {
|
||||||
$('#editDevice').modal('hide');
|
$('#editDevice').modal('hide');
|
||||||
$scope.saveDeviceConfig($scope.currentDevice);
|
$scope.saveDeviceConfig($scope.currentDevice);
|
||||||
};
|
$scope.dismissDeviceRejection($scope.currentDevice.deviceID);
|
||||||
|
|
||||||
$scope.addNewDeviceID = function (device) {
|
|
||||||
var deviceCfg = {
|
|
||||||
deviceID: device,
|
|
||||||
_addressesStr: 'dynamic',
|
|
||||||
compression: 'metadata',
|
|
||||||
introducer: false,
|
|
||||||
selectedFolders: {}
|
|
||||||
};
|
|
||||||
$scope.saveDeviceConfig(deviceCfg);
|
|
||||||
$scope.dismissDeviceRejection(device);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.saveDeviceConfig = function (deviceCfg) {
|
$scope.saveDeviceConfig = function (deviceCfg) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue