diff --git a/.eslintrc.yml b/.eslintrc.yml index a01e1f765..da0d32284 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -104,7 +104,7 @@ overrides: 'react/jsx-no-bind': off 'no-await-in-loop': 'off' 'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }] - 'regex/invalid': ['error', [{ 'regex': 'data-feather="(.*)"', 'message': 'Please use `react-feather` package instead' }]] + 'regex/invalid': ['error', [{ 'regex': ' - + diff --git a/app/agent/components/files-datatable/filesDatatable.html b/app/agent/components/files-datatable/filesDatatable.html index 47e6643fc..c082f229e 100644 --- a/app/agent/components/files-datatable/filesDatatable.html +++ b/app/agent/components/files-datatable/filesDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- + Go to parent @@ -74,15 +74,15 @@ on-enter-key="$ctrl.rename({ name: item.Name, newName: item.newName }); item.edit = false" auto-focus /> - - + + {{ item.Name }} - {{ item.Name }} + {{ item.Name }} {{ item.Size | humansize }} @@ -90,13 +90,13 @@ - Download + Download - Rename + Rename - Delete + Delete diff --git a/app/assets/css/app.css b/app/assets/css/app.css index 33f17f39b..04d56a408 100644 --- a/app/assets/css/app.css +++ b/app/assets/css/app.css @@ -147,27 +147,6 @@ input[type='checkbox'] { background-color: var(--bg-item-highlighted-null-color); } -.fa.green-icon { - color: #23ae89; -} - -.fa.red-icon { - color: #f04438; -} - -.fa.orange-icon { - color: #f0ad4e; -} - -.fa.white-icon { - color: white; -} - -.fa.blue-icon, -.fab.blue-icon { - color: var(--blue-2); -} - .text-warning { @apply text-warning-9 th-dark:text-warning-7 th-highcontrast:text-warning-1; } diff --git a/app/assets/css/icon.css b/app/assets/css/icon.css index cee731f05..bed16a121 100644 --- a/app/assets/css/icon.css +++ b/app/assets/css/icon.css @@ -1,4 +1,4 @@ -.feather { +.lucide { display: block; height: 1em; width: 1em; diff --git a/app/assets/css/index.js b/app/assets/css/index.js index 5bdaebbed..09a566a2a 100644 --- a/app/assets/css/index.js +++ b/app/assets/css/index.js @@ -1,7 +1,4 @@ import 'bootstrap/dist/css/bootstrap.css'; -import '@fortawesome/fontawesome-free/css/brands.css'; -import '@fortawesome/fontawesome-free/css/solid.css'; -import '@fortawesome/fontawesome-free/css/fontawesome.css'; import 'toastr/build/toastr.css'; import 'xterm/dist/xterm.css'; import 'angularjs-slider/dist/rzslider.css'; diff --git a/app/assets/ico/agent.svg b/app/assets/ico/agent.svg deleted file mode 100644 index 31274e7f4..000000000 --- a/app/assets/ico/agent.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/app/assets/ico/api.svg b/app/assets/ico/api.svg deleted file mode 100644 index 2ed7748bf..000000000 --- a/app/assets/ico/api.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/arrow-right-long.svg b/app/assets/ico/arrow-right-long.svg deleted file mode 100644 index 8a33010b7..000000000 --- a/app/assets/ico/arrow-right-long.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/arrows-updown.svg b/app/assets/ico/arrows-updown.svg deleted file mode 100644 index aee24d178..000000000 --- a/app/assets/ico/arrows-updown.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/asterisk.svg b/app/assets/ico/asterisk.svg deleted file mode 100644 index 06f448415..000000000 --- a/app/assets/ico/asterisk.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/bomb.svg b/app/assets/ico/bomb.svg deleted file mode 100644 index eb56b51e7..000000000 --- a/app/assets/ico/bomb.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/circle-notch.svg b/app/assets/ico/circle-notch.svg deleted file mode 100644 index 673847ce8..000000000 --- a/app/assets/ico/circle-notch.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/clock-rewind.svg b/app/assets/ico/clock-rewind.svg deleted file mode 100644 index 0e805daa5..000000000 --- a/app/assets/ico/clock-rewind.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/cloud.svg b/app/assets/ico/cloud.svg deleted file mode 100644 index e4d541039..000000000 --- a/app/assets/ico/cloud.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/compress.svg b/app/assets/ico/compress.svg deleted file mode 100644 index 904b0106b..000000000 --- a/app/assets/ico/compress.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/cubes.svg b/app/assets/ico/cubes.svg deleted file mode 100644 index 15c9ab421..000000000 --- a/app/assets/ico/cubes.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/custom.svg b/app/assets/ico/custom.svg deleted file mode 100644 index 58db0c6b1..000000000 --- a/app/assets/ico/custom.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/dataflow-2.svg b/app/assets/ico/dataflow-2.svg deleted file mode 100644 index 1424f8c5a..000000000 --- a/app/assets/ico/dataflow-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/edge-agent.svg b/app/assets/ico/edge-agent.svg deleted file mode 100644 index a3e45f36a..000000000 --- a/app/assets/ico/edge-agent.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/app/assets/ico/expand.svg b/app/assets/ico/expand.svg deleted file mode 100644 index 611acda9f..000000000 --- a/app/assets/ico/expand.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/file-code.svg b/app/assets/ico/file-code.svg deleted file mode 100644 index 629c5df85..000000000 --- a/app/assets/ico/file-code.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/file-signature.svg b/app/assets/ico/file-signature.svg deleted file mode 100644 index 24dbe9b36..000000000 --- a/app/assets/ico/file-signature.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/file-upload.svg b/app/assets/ico/file-upload.svg deleted file mode 100644 index 4b7cd7291..000000000 --- a/app/assets/ico/file-upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/hacker.svg b/app/assets/ico/hacker.svg deleted file mode 100644 index cc469c7aa..000000000 --- a/app/assets/ico/hacker.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/assets/ico/heartbeat.svg b/app/assets/ico/heartbeat.svg deleted file mode 100644 index 4488a0358..000000000 --- a/app/assets/ico/heartbeat.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/import.svg b/app/assets/ico/import.svg deleted file mode 100644 index 570da8ed2..000000000 --- a/app/assets/ico/import.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/app/assets/ico/laptop.svg b/app/assets/ico/laptop.svg deleted file mode 100644 index 4b3908d1d..000000000 --- a/app/assets/ico/laptop.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/linux.svg b/app/assets/ico/linux.svg new file mode 100644 index 000000000..cf9c86640 --- /dev/null +++ b/app/assets/ico/linux.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/ico/magic-wand.svg b/app/assets/ico/magic-wand.svg deleted file mode 100644 index 720a3420a..000000000 --- a/app/assets/ico/magic-wand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/assets/ico/magic.svg b/app/assets/ico/magic.svg deleted file mode 100644 index d72837a28..000000000 --- a/app/assets/ico/magic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/palette.svg b/app/assets/ico/palette.svg deleted file mode 100644 index 0bc8845b2..000000000 --- a/app/assets/ico/palette.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/placeholder.svg b/app/assets/ico/placeholder.svg index af02c964f..e71f462c9 100644 --- a/app/assets/ico/placeholder.svg +++ b/app/assets/ico/placeholder.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/app/assets/ico/restore.svg b/app/assets/ico/restore.svg deleted file mode 100644 index c34cc7c4d..000000000 --- a/app/assets/ico/restore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/rocket.svg b/app/assets/ico/rocket.svg deleted file mode 100644 index fc1c9d3bf..000000000 --- a/app/assets/ico/rocket.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/share.svg b/app/assets/ico/share.svg deleted file mode 100644 index 76cfe1c4b..000000000 --- a/app/assets/ico/share.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/socket.svg b/app/assets/ico/socket.svg deleted file mode 100644 index b3974e2bc..000000000 --- a/app/assets/ico/socket.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/subscription.svg b/app/assets/ico/subscription.svg new file mode 100644 index 000000000..0e8c96cac --- /dev/null +++ b/app/assets/ico/subscription.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/ico/tachometer.svg b/app/assets/ico/tachometer.svg deleted file mode 100644 index e63266ec2..000000000 --- a/app/assets/ico/tachometer.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/assets/ico/tag-2.svg b/app/assets/ico/tag-2.svg deleted file mode 100644 index fbe3acac2..000000000 --- a/app/assets/ico/tag-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/tags.svg b/app/assets/ico/tags.svg deleted file mode 100644 index dc109152c..000000000 --- a/app/assets/ico/tags.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/template.svg b/app/assets/ico/template.svg deleted file mode 100644 index 3664c6fd3..000000000 --- a/app/assets/ico/template.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/tools.svg b/app/assets/ico/tools.svg deleted file mode 100644 index dbe32e431..000000000 --- a/app/assets/ico/tools.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/upload-cloud.svg b/app/assets/ico/upload-cloud.svg deleted file mode 100644 index 419c88656..000000000 --- a/app/assets/ico/upload-cloud.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/upload.svg b/app/assets/ico/upload.svg deleted file mode 100644 index 77d1d11ac..000000000 --- a/app/assets/ico/upload.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/url.svg b/app/assets/ico/url.svg deleted file mode 100644 index d248e4e80..000000000 --- a/app/assets/ico/url.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/ico/user-circle.svg b/app/assets/ico/user-circle.svg deleted file mode 100644 index 6d1c964c2..000000000 --- a/app/assets/ico/user-circle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/user-secret.svg b/app/assets/ico/user-secret.svg deleted file mode 100644 index 047f44879..000000000 --- a/app/assets/ico/user-secret.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/ico/vendor/docker-icon.svg b/app/assets/ico/vendor/docker-icon.svg new file mode 100644 index 000000000..0e2cbe5ee --- /dev/null +++ b/app/assets/ico/vendor/docker-icon.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/assets/ico/vendor/microsoft-icon.svg b/app/assets/ico/vendor/microsoft-icon.svg new file mode 100644 index 000000000..4a3c87dfb --- /dev/null +++ b/app/assets/ico/vendor/microsoft-icon.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/app/assets/ico/vendor/nomad-icon.svg b/app/assets/ico/vendor/nomad-icon.svg new file mode 100644 index 000000000..0cd04fea3 --- /dev/null +++ b/app/assets/ico/vendor/nomad-icon.svg @@ -0,0 +1,6 @@ + + + + diff --git a/app/assets/ico/zap.svg b/app/assets/ico/zap.svg deleted file mode 100644 index 7689bf45d..000000000 --- a/app/assets/ico/zap.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html index 3acc6e83c..9108ebb1b 100644 --- a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html +++ b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html index b51b96f66..fb096f62e 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.html +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- + - Remove + Remove
- +
@@ -66,7 +66,7 @@ - +
diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html index e254bff51..dbd95dde1 100644 --- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html +++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html @@ -1,6 +1,6 @@
- +
@@ -35,7 +35,8 @@
@@ -51,7 +52,8 @@ > @@ -66,7 +68,7 @@ button-spinner="$ctrl.leaveNetworkActionInProgress" ng-click="$ctrl.leaveNetworkAction($ctrl.container, key)" > - Leave network + Leave networkLeaving network... diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html index 81a6b4dc8..c4f39a3e3 100644 --- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html +++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- +
- +
{{ $ctrl.titleText }}
- +
- +
{{ $ctrl.titleText }}
- + - Remove + Remove @@ -82,13 +82,13 @@ authorization="DockerImageBuild" data-cy="image-buildImageButton" > - Build a new image + Build a new image
- +
@@ -109,7 +109,7 @@ - +
@@ -142,8 +142,14 @@
- Filter - Filter + Filter + + + Filter + +
diff --git a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html index 36251f5e7..f6f8eae45 100644 --- a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html +++ b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html @@ -2,10 +2,15 @@
-
{{ $ctrl.titleText }}
+
+
+ +
+ {{ $ctrl.titleText }} +
- + - + + + +
diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html index 0e8991fca..73371073d 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- +
- +
{{ $ctrl.titleText }}
- + - Remove + Remove
- +
@@ -66,7 +66,7 @@ - +
@@ -95,11 +95,9 @@ is-sorted-desc="$ctrl.state.orderBy === 'Id' && $ctrl.state.reverseOrder" ng-click="$ctrl.changeOrderBy('Id')" > - Filter + Filter Filter Filter
@@ -195,7 +193,7 @@ class="btn btn-xs btn-primary space-left" authorization="DockerAgentBrowseList" > - browse + browse Unused diff --git a/app/docker/components/host-view-panels/devices-panel/devices-panel.html b/app/docker/components/host-view-panels/devices-panel/devices-panel.html index f0154ae08..4f451c494 100644 --- a/app/docker/components/host-view-panels/devices-panel/devices-panel.html +++ b/app/docker/components/host-view-panels/devices-panel/devices-panel.html @@ -1,7 +1,7 @@
- +
- Go to cluster visualizer + Go to cluster visualizer
IP Address - + + Gateway {{ key }} diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html index 7cd726524..5a2a167b5 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.html +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- + - Remove + Remove
- +
@@ -66,7 +66,7 @@ - +
@@ -89,7 +89,8 @@ - + +
diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html index e3eeff25c..1439d6955 100644 --- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html +++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html @@ -2,10 +2,15 @@
-
{{ $ctrl.titleText }}
+
+
+ +
+ {{ $ctrl.titleText }} +
- +
- +
{{ $ctrl.titleText }}
- + - +
@@ -45,7 +45,7 @@ - +
diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html index ea4641aba..90305ccc9 100644 --- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html +++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- + - Remove + Remove
- +
@@ -66,7 +66,7 @@ - +
diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html index 5608e9e84..0bc6aaa4f 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html @@ -12,8 +12,14 @@ ng-click="$ctrl.changeOrderBy('Status.State')" > - Filter - Filter + Filter + + + Filter + +
diff --git a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html index 4c69d23fb..e905618ca 100644 --- a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html +++ b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html @@ -9,7 +9,7 @@ ng-click="$ctrl.updateAction($ctrl.selectedItems)" data-cy="service-updateServiceButton" > - Update + Update
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html index a89e68c74..c49c60ea7 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.html +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html @@ -4,12 +4,12 @@
- +
{{ $ctrl.titleText }}
- + - +
@@ -53,7 +53,7 @@ - +
@@ -76,7 +76,8 @@ - + +
@@ -156,7 +157,8 @@ - + + - {{ p.PublishedPort }}:{{ p.TargetPort }} + + {{ p.PublishedPort }}:{{ p.TargetPort }} -
diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.html b/app/docker/components/host-view-panels/disks-panel/disks-panel.html index 441782dab..2096a1f44 100644 --- a/app/docker/components/host-view-panels/disks-panel/disks-panel.html +++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.html @@ -1,7 +1,7 @@
- +
diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html index 0ce6b96a2..0ea5fd90a 100644 --- a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html +++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html @@ -1,7 +1,7 @@
- +
diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html index cf7d2ac3e..14c83b736 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html @@ -1,7 +1,7 @@
- +
diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html index 34913d716..9a953fba8 100644 --- a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html +++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html @@ -11,7 +11,7 @@ diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html index b169da57f..5e431af98 100644 --- a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html +++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html @@ -1,7 +1,7 @@
- +
@@ -33,7 +33,7 @@ diff --git a/app/docker/components/imageRegistry/por-image-registry-rate-limits.html b/app/docker/components/imageRegistry/por-image-registry-rate-limits.html index d55189f44..a50f0c759 100644 --- a/app/docker/components/imageRegistry/por-image-registry-rate-limits.html +++ b/app/docker/components/imageRegistry/por-image-registry-rate-limits.html @@ -1,7 +1,7 @@
- + You are currently using a free account to pull images from DockerHub and will be limited to 200 pulls every 6 hours. Remaining pulls: {{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }} @@ -20,7 +20,7 @@
- + Your authorized pull count quota as a free user is now exceeded. You will not be able to pull any image from the DockerHub registry. diff --git a/app/docker/components/imageRegistry/por-image-registry.html b/app/docker/components/imageRegistry/por-image-registry.html index f16211146..4c079f8e4 100644 --- a/app/docker/components/imageRegistry/por-image-registry.html +++ b/app/docker/components/imageRegistry/por-image-registry.html @@ -62,7 +62,7 @@

- Image name is required. + Image name is required. Tag must be specified otherwise Portainer will pull all tags associated to the image.

@@ -72,10 +72,10 @@
diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html index 2f3ac1f15..bc269823b 100644 --- a/app/docker/components/log-viewer/logViewer.html +++ b/app/docker/components/log-viewer/logViewer.html @@ -1,7 +1,7 @@
- +
@@ -55,25 +55,25 @@
Download logs Copy Copy selected lines Unselect - +
diff --git a/app/docker/components/network-macvlan-form/networkMacvlanForm.html b/app/docker/components/network-macvlan-form/networkMacvlanForm.html index 980219c38..ee5112f81 100644 --- a/app/docker/components/network-macvlan-form/networkMacvlanForm.html +++ b/app/docker/components/network-macvlan-form/networkMacvlanForm.html @@ -3,7 +3,7 @@
- + To create a MACVLAN network you need to create a configuration, then create the network from this configuration.
@@ -14,7 +14,7 @@
- label + label
Node Labels
@@ -16,10 +16,10 @@ @@ -63,7 +63,7 @@
- +
diff --git a/app/docker/views/containers/console/attach.html b/app/docker/views/containers/console/attach.html index 3e96401d3..7d07c2188 100644 --- a/app/docker/views/containers/console/attach.html +++ b/app/docker/views/containers/console/attach.html @@ -2,9 +2,9 @@ title="'Container console'" breadcrumbs="[ { label:'Containers', link:'docker.containers' }, - { + { label:(container.Name | trimcontainername), - link: 'docker.containers.container', + link: 'docker.containers.container', linkParams:container.Id }, 'Console']" > @@ -13,25 +13,25 @@
- +

- + The interactive-flag is not set. You might not be able to use the console properly.

- + The TTY-flag is not set. You might not be able to use the console properly.

- + The container is not running.

diff --git a/app/docker/views/containers/console/exec.html b/app/docker/views/containers/console/exec.html index 04675baa3..e49168d12 100644 --- a/app/docker/views/containers/console/exec.html +++ b/app/docker/views/containers/console/exec.html @@ -2,9 +2,9 @@ title="'Container console'" breadcrumbs="[ { label:'Containers', link:'docker.containers' }, - { + { label:(container.Name | trimcontainername), - link: 'docker.containers.container', + link: 'docker.containers.container', linkParams:container.Id }, 'Console']" > @@ -13,7 +13,7 @@
- +
@@ -23,8 +23,8 @@
- - + +
@@ -368,7 +368,7 @@
- map additional volume + map additional volume
@@ -389,7 +389,7 @@
@@ -397,7 +397,7 @@
- +
volume @@ -526,7 +526,7 @@
- add additional entry + add additional entry
@@ -537,7 +537,7 @@
@@ -554,9 +554,7 @@
- - add label - + add label
@@ -570,7 +568,7 @@
@@ -645,9 +643,7 @@
- - add device - + add device
@@ -661,7 +657,7 @@
@@ -672,9 +668,7 @@
- - add sysctl - + add sysctl
@@ -688,7 +682,7 @@
@@ -753,7 +747,7 @@

- Value must be between 0 and {{ state.sliderMaxMemory }}. + Value must be between 0 and {{ state.sliderMaxMemory }}.

@@ -790,7 +784,7 @@

- Value must be between 0 and {{ state.sliderMaxMemory }}. + Value must be between 0 and {{ state.sliderMaxMemory }}.

@@ -829,7 +823,8 @@

- Updating any resource value to ‘unlimited' will redeploy this container. + + Updating any resource value to ‘unlimited' will redeploy this container.

diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html index 908bf81b2..a62a443d2 100644 --- a/app/docker/views/containers/edit/container.html +++ b/app/docker/views/containers/edit/container.html @@ -6,35 +6,41 @@ >
- +
- + + Restart - + Pause - + + Resume +
@@ -45,11 +51,15 @@ ng-click="recreate()" button-spinner="state.recreateContainerInProgress" > - Recreate + + + Recreate Recreation in progress... - Duplicate/Edit + + Duplicate/Edit
@@ -60,7 +70,7 @@
- +
{{ config.Id }} Delete this config Clone config
@@ -73,14 +83,18 @@ @@ -91,8 +105,8 @@ @@ -127,19 +141,19 @@ @@ -167,7 +181,7 @@
- +
@@ -219,7 +233,7 @@
- +
{{ container.Name | trimcontainername }} - - + + + + + +
Status - - + + {{ container.State | getstatetext }} for {{ activityTime }} with exit code {{ container.State.ExitCode }}
LogsLogs InspectInspect StatsStats ConsoleConsole AttachAttach
@@ -232,7 +246,11 @@ @@ -306,7 +324,7 @@
- +
Port configuration -
{{ portMapping.host }} {{ portMapping.container }}
+
+ {{ portMapping.host }} + + {{ portMapping.container }} +
diff --git a/app/docker/views/containers/inspect/containerinspect.html b/app/docker/views/containers/inspect/containerinspect.html index c972ac2c0..1eba19ad4 100644 --- a/app/docker/views/containers/inspect/containerinspect.html +++ b/app/docker/views/containers/inspect/containerinspect.html @@ -2,9 +2,9 @@ title="'Container inspect'" breadcrumbs="[ { label:'Containers', link:'docker.containers' }, - { + { label:(containerInfo.Name | trimcontainername), - link: 'docker.containers.container', + link: 'docker.containers.container', linkParams:containerInfo.Id }, 'Inspect']" > @@ -13,10 +13,10 @@
- + - - + + diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html index 752788029..083fa82d5 100644 --- a/app/docker/views/containers/stats/containerstats.html +++ b/app/docker/views/containers/stats/containerstats.html @@ -2,9 +2,9 @@ title="'Container statistics'" breadcrumbs="[ { label:'Containers', link:'docker.containers' }, - { + { label:(container.Name | trimcontainername), - link: 'docker.containers.container', + link: 'docker.containers.container', linkParams:container.Id }, 'Stats']" > @@ -13,7 +13,7 @@
- +
@@ -37,17 +37,23 @@
- +
- Network stats are unavailable for this container. + + + Network stats are unavailable for this container. +
- I/O stats are unavailable for this container. + + + I/O stats are unavailable for this container. +
@@ -59,7 +65,7 @@
- +
@@ -70,7 +76,7 @@
- +
@@ -81,7 +87,7 @@
- +
@@ -92,7 +98,7 @@
- +
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html index 6c18962e7..80c1b4257 100644 --- a/app/docker/views/dashboard/dashboard.html +++ b/app/docker/views/dashboard/dashboard.html @@ -16,12 +16,12 @@ >

- + Portainer is connected to a node that is part of a Swarm cluster. Some resources located on other nodes in the cluster might not be available for management, have a look at our agent setup for more details.

- + Portainer is connected to a worker node. Swarm management features will not be available.

@@ -31,7 +31,7 @@
- +
@@ -40,12 +40,15 @@ @@ -64,7 +67,7 @@ @@ -77,33 +80,33 @@
- +
- +
- + - + - + - +
- +
diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html index e4ae0088b..013015ea6 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.html +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html @@ -8,7 +8,7 @@
Host and Filesystem
- + These features are only available for an Agent enabled environments.
@@ -141,7 +141,7 @@
- + Note: The recreate/duplicate/edit feature is currently disabled (for non-admin users) by one or more security settings.
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html index 792a7f4c8..996d03274 100644 --- a/app/docker/views/images/build/buildimage.html +++ b/app/docker/views/images/build/buildimage.html @@ -6,7 +6,7 @@ - Builder + Builder
Naming
@@ -16,17 +16,13 @@
- - add additional name - + add additional name
-

- You must specify at least one name for the image. -

+

You must specify at least one name for the image.

@@ -46,22 +42,22 @@ name - + - +
- + The image name must be unique The image name must consist of between 2 and 255 lowercase alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').
@@ -184,7 +180,7 @@
URL
- + Specify the URL to a Dockerfile, a tarball or a public Git repository (suffixed by .git). When using a Git repository URL, build contexts can be specified as in the Docker documentation.
- + Indicate the path to the Dockerfile within the tarball/repository (ignored when using a Dockerfile).
@@ -248,7 +244,7 @@ - Output + Output 
               
{{ line }}

               
No build output available.

diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index bdde4e217..abd830616 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -3,7 +3,7 @@
 

   

     
-      
+      
       
         

           

@@ -16,19 +16,19 @@
                   
                     
                       
-                        
+                        
                       
                     
 
                     
                       
-                        
+                        
                       
                     
 
                     
                       
-                        
+                        
                       
                     
                   
@@ -39,18 +39,18 @@
           

             

               
-                Note: you can click on the upload icon  to push an image or on the download icon
-                 to pull an image or on the trash icon  to delete a tag.
+                Note: you can click on the upload icon  to push an image or on the download icon  to pull an
+                image or on the trash icon  to delete a tag.
               
             

             

               
               
             

           

@@ -63,7 +63,7 @@
 

   

     
-      
+      
       
         
           
@@ -98,7 +98,7 @@
 

   

     
-      
+
{{ endpoint.Name }} - {{ endpoint.Snapshots[0].TotalCPU }} + {{ endpoint.Snapshots[0].TotalCPU }} {{ endpoint.Snapshots[0].TotalMemory | humansize }} - {{ info.Swarm && info.Swarm.NodeID !== '' ? 'Swarm' : 'Standalone' }} {{ info.ServerVersion }} - + Agent + + Agent
- Go to cluster visualizer + Go to cluster visualizer
@@ -107,7 +107,7 @@
{{ image.Id }} @@ -167,7 +167,7 @@
- + @@ -216,7 +216,7 @@ {{ layer.CreatedBy | imagelayercommand | truncate: 130 }} - + diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html index 91dcb51d7..f81e07f4b 100644 --- a/app/docker/views/images/images.html +++ b/app/docker/views/images/images.html @@ -3,7 +3,7 @@
- + diff --git a/app/docker/views/images/import/importimage.html b/app/docker/views/images/import/importimage.html index b4097e27c..cda5dce97 100644 --- a/app/docker/views/images/import/importimage.html +++ b/app/docker/views/images/import/importimage.html @@ -15,7 +15,7 @@ {{ formValues.UploadFile.name }} - +
@@ -29,7 +29,7 @@
- +
-
- Add driver option -
+
Add driver option
@@ -94,16 +92,16 @@ />
-

Exclude ip cannot be the same as gateway.

+

Exclude ip cannot be the same as gateway.

- Add excluded IP + Add excluded IP
@@ -141,16 +139,16 @@ />
-

Exclude ip cannot be the same as gateway.

+

Exclude ip cannot be the same as gateway.

- Add excluded IP + Add excluded IP
@@ -168,14 +166,12 @@ value -
-
- Add label -
+
Add label
diff --git a/app/docker/views/secrets/create/createsecret.html b/app/docker/views/secrets/create/createsecret.html index 32660500d..a8216950f 100644 --- a/app/docker/views/secrets/create/createsecret.html +++ b/app/docker/views/secrets/create/createsecret.html @@ -38,9 +38,7 @@
- - add label - + add label
@@ -54,7 +52,7 @@
diff --git a/app/docker/views/secrets/edit/secret.html b/app/docker/views/secrets/edit/secret.html index 7f0bbd34a..93ceb89be 100644 --- a/app/docker/views/secrets/edit/secret.html +++ b/app/docker/views/secrets/edit/secret.html @@ -3,7 +3,7 @@
- +
@@ -16,7 +16,7 @@ diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html index a537f7d2e..0fe9cf2b7 100644 --- a/app/docker/views/services/create/createservice.html +++ b/app/docker/views/services/create/createservice.html @@ -51,7 +51,7 @@
- map additional port + map additional port
@@ -63,7 +63,7 @@
- +
@@ -82,7 +82,7 @@
@@ -218,7 +218,7 @@ style="margin-left: 10px" ng-click="!formValues.LogDriverName || formValues.LogDriverName === 'none' || addLogDriverOpt(formValues.LogDriverName)" > - add logging driver option + add logging driver option @@ -233,7 +233,7 @@ @@ -251,7 +251,7 @@
- map additional volume + map additional volume
@@ -266,9 +266,7 @@ container -
- Target is required. -
+
Target is required.
@@ -278,7 +276,7 @@ @@ -287,7 +285,7 @@
- +
@@ -301,9 +299,7 @@
-
- Source is required. -
+
Source is required.
@@ -312,9 +308,7 @@ host -
- Source is required. -
+
Source is required.
@@ -356,7 +350,7 @@
- add extra network + add extra network
@@ -367,7 +361,7 @@ @@ -379,7 +373,7 @@
- add additional entry + add additional entry
@@ -390,7 +384,7 @@ @@ -417,7 +411,7 @@
- add service label + add service label
@@ -432,7 +426,7 @@ @@ -444,7 +438,7 @@
- add container label + add container label
@@ -459,7 +453,7 @@ diff --git a/app/docker/views/services/create/includes/config.html b/app/docker/views/services/create/includes/config.html index f8cde6a96..edbf2c367 100644 --- a/app/docker/views/services/create/includes/config.html +++ b/app/docker/views/services/create/includes/config.html @@ -2,14 +2,12 @@
- - add a config - + add a config
- {{ formValues.Configs.$error }} + {{ formValues.Configs.$error }}
@@ -25,7 +23,7 @@
diff --git a/app/docker/views/services/create/includes/resources-placement.html b/app/docker/views/services/create/includes/resources-placement.html index 90056a42c..9a29d5c46 100644 --- a/app/docker/views/services/create/includes/resources-placement.html +++ b/app/docker/views/services/create/includes/resources-placement.html @@ -56,7 +56,7 @@
- placement constraint + placement constraint
@@ -76,7 +76,7 @@
@@ -87,7 +87,7 @@
- placement preference + placement preference
@@ -101,7 +101,7 @@
diff --git a/app/docker/views/services/create/includes/secret.html b/app/docker/views/services/create/includes/secret.html index a6658a000..9875ed075 100644 --- a/app/docker/views/services/create/includes/secret.html +++ b/app/docker/views/services/create/includes/secret.html @@ -8,14 +8,12 @@
- - add a secret - + add a secret
- {{ formValues.Secrets.$error }} + {{ formValues.Secrets.$error }}
@@ -36,7 +34,7 @@
diff --git a/app/docker/views/services/edit/includes/configs.html b/app/docker/views/services/edit/includes/configs.html index bddcd0a41..3a6300277 100644 --- a/app/docker/views/services/edit/includes/configs.html +++ b/app/docker/views/services/edit/includes/configs.html @@ -1,13 +1,13 @@ - +
Add a config: - add config + add config
{{ secret.Id }} Delete this secret
@@ -40,7 +40,7 @@ diff --git a/app/docker/views/services/edit/includes/constraints.html b/app/docker/views/services/edit/includes/constraints.html index d34c7717d..6af325fa5 100644 --- a/app/docker/views/services/edit/includes/constraints.html +++ b/app/docker/views/services/edit/includes/constraints.html @@ -1,9 +1,9 @@ diff --git a/app/docker/views/services/edit/includes/container-specs.html b/app/docker/views/services/edit/includes/container-specs.html index b7d2d93c9..44000d42d 100644 --- a/app/docker/views/services/edit/includes/container-specs.html +++ b/app/docker/views/services/edit/includes/container-specs.html @@ -1,6 +1,6 @@
- +
{{ config.Mode }}
diff --git a/app/docker/views/services/edit/includes/containerlabels.html b/app/docker/views/services/edit/includes/containerlabels.html index e47f32342..ce6e38316 100644 --- a/app/docker/views/services/edit/includes/containerlabels.html +++ b/app/docker/views/services/edit/includes/containerlabels.html @@ -1,9 +1,9 @@
- +
- container label + container label
@@ -48,7 +48,7 @@ />
diff --git a/app/docker/views/services/edit/includes/environmentvariables.html b/app/docker/views/services/edit/includes/environmentvariables.html index b34b44593..6d9b15491 100644 --- a/app/docker/views/services/edit/includes/environmentvariables.html +++ b/app/docker/views/services/edit/includes/environmentvariables.html @@ -1,9 +1,9 @@ - +
- environment variable + environment variable
diff --git a/app/docker/views/services/edit/includes/hosts.html b/app/docker/views/services/edit/includes/hosts.html index b467eab58..7e16473cf 100644 --- a/app/docker/views/services/edit/includes/hosts.html +++ b/app/docker/views/services/edit/includes/hosts.html @@ -1,9 +1,9 @@
- +
- add host entry + add host entry
@@ -46,7 +46,7 @@ />
diff --git a/app/docker/views/services/edit/includes/image.html b/app/docker/views/services/edit/includes/image.html index 272870610..43022c46d 100644 --- a/app/docker/views/services/edit/includes/image.html +++ b/app/docker/views/services/edit/includes/image.html @@ -1,6 +1,6 @@
- + - +
Driver: @@ -10,7 +10,7 @@ - add logging driver option + add logging driver option
@@ -42,7 +42,7 @@ /> diff --git a/app/docker/views/services/edit/includes/mounts.html b/app/docker/views/services/edit/includes/mounts.html index bf8506d84..206ea42d2 100644 --- a/app/docker/views/services/edit/includes/mounts.html +++ b/app/docker/views/services/edit/includes/mounts.html @@ -1,10 +1,8 @@
- +
- - mount - + mount
@@ -57,9 +55,7 @@ ng-disabled="isUpdating || (!isAdmin && !allowBindMounts && mount.Type === 'bind')" ng-if="mount.Type === 'bind'" /> -
- Source is required. -
+
Source is required.
diff --git a/app/docker/views/services/edit/includes/networks.html b/app/docker/views/services/edit/includes/networks.html index a63ad5f23..8ec0294b0 100644 --- a/app/docker/views/services/edit/includes/networks.html +++ b/app/docker/views/services/edit/includes/networks.html @@ -1,10 +1,8 @@
- +
- - network - + network
@@ -45,7 +43,7 @@
diff --git a/app/docker/views/services/edit/includes/placementPreferences.html b/app/docker/views/services/edit/includes/placementPreferences.html index 6c156a33c..ec9866bbd 100644 --- a/app/docker/views/services/edit/includes/placementPreferences.html +++ b/app/docker/views/services/edit/includes/placementPreferences.html @@ -1,9 +1,9 @@ diff --git a/app/docker/views/services/edit/includes/ports.html b/app/docker/views/services/edit/includes/ports.html index 69cc8d176..9ff9fa956 100644 --- a/app/docker/views/services/edit/includes/ports.html +++ b/app/docker/views/services/edit/includes/ports.html @@ -1,9 +1,9 @@
- +
- port mapping + port mapping
@@ -82,7 +82,7 @@
diff --git a/app/docker/views/services/edit/includes/resources.html b/app/docker/views/services/edit/includes/resources.html index 300fd7594..e189edb9f 100644 --- a/app/docker/views/services/edit/includes/resources.html +++ b/app/docker/views/services/edit/includes/resources.html @@ -1,6 +1,6 @@
- +
-
- Target is required. -
+
Target is required.
@@ -81,7 +75,7 @@
diff --git a/app/docker/views/services/edit/includes/restart.html b/app/docker/views/services/edit/includes/restart.html index c6b06e095..eb4cbed44 100644 --- a/app/docker/views/services/edit/includes/restart.html +++ b/app/docker/views/services/edit/includes/restart.html @@ -1,6 +1,6 @@
- +
diff --git a/app/docker/views/services/edit/includes/secrets.html b/app/docker/views/services/edit/includes/secrets.html index bd1b116d5..7f5915c94 100644 --- a/app/docker/views/services/edit/includes/secrets.html +++ b/app/docker/views/services/edit/includes/secrets.html @@ -1,6 +1,6 @@
- +
Add a secret: @@ -15,7 +15,7 @@
- add secret + add secret
@@ -39,7 +39,7 @@ diff --git a/app/docker/views/services/edit/includes/servicelabels.html b/app/docker/views/services/edit/includes/servicelabels.html index 5bb456617..838a90c1e 100644 --- a/app/docker/views/services/edit/includes/servicelabels.html +++ b/app/docker/views/services/edit/includes/servicelabels.html @@ -1,10 +1,8 @@
- +
- - label - + label
@@ -48,7 +46,7 @@ />
diff --git a/app/docker/views/services/edit/includes/updateconfig.html b/app/docker/views/services/edit/includes/updateconfig.html index 0bc60837b..6e49a7c0a 100644 --- a/app/docker/views/services/edit/includes/updateconfig.html +++ b/app/docker/views/services/edit/includes/updateconfig.html @@ -1,6 +1,6 @@
- +
{{ secret.Mode }}
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html index e3ed5ca3a..d8b340843 100644 --- a/app/docker/views/services/edit/service.html +++ b/app/docker/views/services/edit/service.html @@ -12,7 +12,7 @@
- +
@@ -78,10 +78,13 @@ @@ -89,52 +92,62 @@ + +
{{ webhookURL | truncatelr }} - +

Note: you can only rollback one level of changes. Clicking the rollback button without making a new change will undo your previous rollback

+ >

Service logs + Service logs -

@@ -163,7 +176,7 @@
- +