diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html index 4c2cdc696a..59b5b4240c 100644 --- a/dashboard-ui/channelsettings.html +++ b/dashboard-ui/channelsettings.html @@ -50,8 +50,7 @@
  • -
    ${LabelChannelDownloadSizeLimitHelp}
    -
    ${ButtonLearnMore}
    +
    ${LabelChannelDownloadSizeLimitHelpText}
  • diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html new file mode 100644 index 0000000000..fb99261a58 --- /dev/null +++ b/dashboard-ui/device.html @@ -0,0 +1,50 @@ + + + + ${TitleDevices} + + +
    + +
    +
    + +
    + ${TabDevices} + ${TabCameraUpload} +
    + +
    + +
    + +
      +
    • + +
      + +
      + +
      ${LabelCameraUploadPathHelp}
      +
      • + +

    +
      +
    • + + +
      • +
    + +
    + +
    +
    +
    +
    + + diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html index 1a13b93cd7..b4c4ccea72 100644 --- a/dashboard-ui/devicesupload.html +++ b/dashboard-ui/devicesupload.html @@ -31,12 +31,17 @@


    @@ -45,7 +50,7 @@ -
    • diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/dashboard-ui/scripts/device.js @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js index e21751c07c..fa150733be 100644 --- a/dashboard-ui/scripts/devices.js +++ b/dashboard-ui/scripts/devices.js @@ -34,12 +34,18 @@ var deviceHtml = ''; deviceHtml += '
  • '; - deviceHtml += ''; + deviceHtml += ''; deviceHtml += '

    '; deviceHtml += d.Name; deviceHtml += '

    '; + if (d.AppName) { + deviceHtml += '

    '; + deviceHtml += d.AppName; + deviceHtml += '

    '; + } + if (d.LastUserName) { deviceHtml += '

    '; deviceHtml += Globalize.translate('DeviceLastUsedByUserName', d.LastUserName); diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js index 9063452f79..bf53f660e2 100644 --- a/dashboard-ui/scripts/devicesupload.js +++ b/dashboard-ui/scripts/devicesupload.js @@ -12,6 +12,8 @@ $('#txtUploadPath', page).val(config.CameraUploadPath || ''); + $('#chkSubfolder', page).checked(config.EnableCameraUploadSubfolders).checkboxradio('refresh'); + loadDeviceList(page, devices, config); } @@ -34,6 +36,11 @@ deviceHtml += ''; var isChecked = config.EnabledCameraUploadDevices.indexOf(d.Id) != -1; @@ -88,6 +95,8 @@ }); + config.EnableCameraUploadSubfolders = $('#chkSubfolder', page).checked(); + ApiClient.updateNamedConfiguration("devices", config).done(Dashboard.processServerConfigurationUpdateResult); });