Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
514bbd58
Commit
514bbd58
authored
Dec 11, 2013
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed typo
parent
e5eff110
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
Utils.js
www/manager/Utils.js
+1
-1
VNCConsole.js
www/manager/VNCConsole.js
+2
-2
Config.js
www/manager/node/Config.js
+1
-1
CmdMenu.js
www/manager/openvz/CmdMenu.js
+1
-1
Config.js
www/manager/openvz/Config.js
+1
-1
CmdMenu.js
www/manager/qemu/CmdMenu.js
+1
-1
Config.js
www/manager/qemu/Config.js
+2
-2
No files found.
www/manager/Utils.js
View file @
514bbd58
...
@@ -912,7 +912,7 @@ Ext.define('PVE.Utils', { statics: {
...
@@ -912,7 +912,7 @@ Ext.define('PVE.Utils', { statics: {
}
}
},
},
openConoleWindow
:
function
(
vmtype
,
vmid
,
nodename
,
vmname
)
{
openCon
s
oleWindow
:
function
(
vmtype
,
vmid
,
nodename
,
vmname
)
{
var
url
=
Ext
.
urlEncode
({
var
url
=
Ext
.
urlEncode
({
console
:
vmtype
,
// kvm, openvz or shell
console
:
vmtype
,
// kvm, openvz or shell
vmid
:
vmid
,
vmid
:
vmid
,
...
...
www/manager/VNCConsole.js
View file @
514bbd58
...
@@ -296,7 +296,7 @@ Ext.define('PVE.KVMConsole', {
...
@@ -296,7 +296,7 @@ Ext.define('PVE.KVMConsole', {
{
{
text
:
gettext
(
'
Console
'
),
text
:
gettext
(
'
Console
'
),
handler
:
function
()
{
handler
:
function
()
{
PVE
.
Utils
.
openConoleWindow
(
'
kvm
'
,
me
.
vmid
,
me
.
nodename
,
me
.
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
kvm
'
,
me
.
vmid
,
me
.
nodename
,
me
.
vmname
);
}
}
},
},
'
->
'
,
'
->
'
,
...
@@ -450,7 +450,7 @@ Ext.define('PVE.Shell', {
...
@@ -450,7 +450,7 @@ Ext.define('PVE.Shell', {
{
{
text
:
gettext
(
'
Shell
'
),
text
:
gettext
(
'
Shell
'
),
handler
:
function
()
{
handler
:
function
()
{
PVE
.
Utils
.
openConoleWindow
(
'
shell
'
,
undefined
,
me
.
nodename
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
shell
'
,
undefined
,
me
.
nodename
);
}
}
}
}
]);
]);
...
...
www/manager/node/Config.js
View file @
514bbd58
...
@@ -55,7 +55,7 @@ Ext.define('PVE.node.Config', {
...
@@ -55,7 +55,7 @@ Ext.define('PVE.node.Config', {
var
params
=
{
proxy
:
window
.
location
.
hostname
};
var
params
=
{
proxy
:
window
.
location
.
hostname
};
PVE
.
Utils
.
openSpiceViewer
(
'
/nodes/
'
+
nodename
+
'
/spiceshell
'
,
params
);
PVE
.
Utils
.
openSpiceViewer
(
'
/nodes/
'
+
nodename
+
'
/spiceshell
'
,
params
);
}
else
{
}
else
{
PVE
.
Utils
.
openConoleWindow
(
'
shell
'
,
undefined
,
nodename
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
shell
'
,
undefined
,
nodename
);
}
}
}
}
});
});
...
...
www/manager/openvz/CmdMenu.js
View file @
514bbd58
...
@@ -81,7 +81,7 @@ Ext.define('PVE.openvz.CmdMenu', {
...
@@ -81,7 +81,7 @@ Ext.define('PVE.openvz.CmdMenu', {
text
:
gettext
(
'
Console
'
),
text
:
gettext
(
'
Console
'
),
icon
:
'
/pve2/images/display.png
'
,
icon
:
'
/pve2/images/display.png
'
,
handler
:
function
()
{
handler
:
function
()
{
PVE
.
Utils
.
openConoleWindow
(
'
openvz
'
,
vmid
,
nodename
,
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
openvz
'
,
vmid
,
nodename
,
vmname
);
}
}
}
}
];
];
...
...
www/manager/openvz/Config.js
View file @
514bbd58
...
@@ -110,7 +110,7 @@ Ext.define('PVE.openvz.Config', {
...
@@ -110,7 +110,7 @@ Ext.define('PVE.openvz.Config', {
PVE
.
Utils
.
openSpiceViewer
(
'
/nodes/
'
+
nodename
+
'
/openvz/
'
+
vmid
+
PVE
.
Utils
.
openSpiceViewer
(
'
/nodes/
'
+
nodename
+
'
/openvz/
'
+
vmid
+
'
/spiceproxy
'
,
params
);
'
/spiceproxy
'
,
params
);
}
else
{
}
else
{
PVE
.
Utils
.
openConoleWindow
(
'
openvz
'
,
vmid
,
nodename
,
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
openvz
'
,
vmid
,
nodename
,
vmname
);
}
}
}
}
});
});
...
...
www/manager/qemu/CmdMenu.js
View file @
514bbd58
...
@@ -120,7 +120,7 @@ Ext.define('PVE.qemu.CmdMenu', {
...
@@ -120,7 +120,7 @@ Ext.define('PVE.qemu.CmdMenu', {
success
:
function
(
response
,
opts
)
{
success
:
function
(
response
,
opts
)
{
var
spice
=
response
.
result
.
data
.
spice
;
var
spice
=
response
.
result
.
data
.
spice
;
if
(
PVE
.
VersionInfo
.
console
===
'
applet
'
||
!
spice
)
{
if
(
PVE
.
VersionInfo
.
console
===
'
applet
'
||
!
spice
)
{
PVE
.
Utils
.
openConoleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
}
else
{
}
else
{
var
url
=
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
'
/spiceproxy
'
;
var
url
=
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
'
/spiceproxy
'
;
var
params
=
{
proxy
:
window
.
location
.
hostname
};
var
params
=
{
proxy
:
window
.
location
.
hostname
};
...
...
www/manager/qemu/Config.js
View file @
514bbd58
...
@@ -126,7 +126,7 @@ Ext.define('PVE.qemu.Config', {
...
@@ -126,7 +126,7 @@ Ext.define('PVE.qemu.Config', {
disabled
:
!
caps
.
vms
[
'
VM.Console
'
],
disabled
:
!
caps
.
vms
[
'
VM.Console
'
],
handler
:
function
()
{
handler
:
function
()
{
if
(
PVE
.
VersionInfo
.
console
===
'
applet
'
||
!
spice
)
{
if
(
PVE
.
VersionInfo
.
console
===
'
applet
'
||
!
spice
)
{
PVE
.
Utils
.
openConoleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
}
else
{
}
else
{
var
url
=
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
'
/spiceproxy
'
;
var
url
=
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
'
/spiceproxy
'
;
var
params
=
{
proxy
:
window
.
location
.
hostname
};
var
params
=
{
proxy
:
window
.
location
.
hostname
};
...
@@ -138,7 +138,7 @@ Ext.define('PVE.qemu.Config', {
...
@@ -138,7 +138,7 @@ Ext.define('PVE.qemu.Config', {
{
{
text
:
'
VNC
'
,
text
:
'
VNC
'
,
handler
:
function
(){
handler
:
function
(){
PVE
.
Utils
.
openConoleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
PVE
.
Utils
.
openCon
s
oleWindow
(
'
kvm
'
,
vmid
,
nodename
,
vmname
);
}
}
},
},
spiceMenu
spiceMenu
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment