Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(terminal): display os specific copy/paste tooltip EE-1976 (#10835)

Browse source
This commit is contained in:
Dakota Walsh 2024-01-24 09:45:40 +13:00 • committed by GitHub
parent fc7d9ca2cd
commit fe47318e26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 81 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/docker/views/containers/console/containerConsoleController.js
View file

@ -183,8 +183,11 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
socket.onopen = function () {
$scope.state = states.connected;
term = new Terminal();
socket.send('export LANG=C.UTF-8\n');
socket.send('export LC_ALL=C.UTF-8\n');
socket.send('clear\n');
term.on('data', function (data) {
term.onData(function (data) {
socket.send(data);
});
var terminal_container = document.getElementById('terminal-container');

8
app/docker/views/containers/console/exec.html
View file

@ -69,9 +69,11 @@
</div>
</div>
<div ng-if="state !== states.disconnected">
<label
>Exec into container as <code>{{ ::formValues.user || 'default user' }}</code> using command
<code>{{ formValues.isCustomCommand ? formValues.customCommand : formValues.command }}</code></label
<label class="control-label text-left"
>Exec &nbsp;into container as <code>{{ ::formValues.user || 'default user' }}</code> using command
<code>{{ formValues.isCustomCommand ? formValues.customCommand : formValues.command }}</code>
<terminal-tooltip> </terminal-tooltip>
></label
>
<button type="button" class="btn btn-primary" ng-click="disconnect()">
<span ng-show="state === states.connected">Disconnect</span>