simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make "${url}" include the URL parameters.

Browse source 
Cleanup the transparent printing HTML a little bit.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@178 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-08-23 15:27:15 +00:00
parent 065ac9f0fb
commit 69cfac0161
12 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -138,7 +138,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "176" #define VCS_REVISION "178"
/* Version number of package */ /* Version number of package */
#define VERSION "2.9" #define VERSION "2.9"

2
configure vendored
View file

@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=176 VCS_REVISION=178
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.9, markus@shellinabox.com) AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
VCS_REVISION=176 VCS_REVISION=178
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
debian/rules vendored
View file

@ -101,7 +101,7 @@ binary-arch: build install
dh_installchangelogs ChangeLog dh_installchangelogs ChangeLog
dh_installdocs --exclude COPYING --exclude INSTALL --exclude ChangeLog dh_installdocs --exclude COPYING --exclude INSTALL --exclude ChangeLog
dh_installexamples dh_installexamples
dh_install dh_install --sourcedir=debian/tmp
# dh_installmenu # dh_installmenu
# dh_installdebconf # dh_installdebconf
# dh_installlogrotate # dh_installlogrotate

11
demo/print-styles.css
View file

@ -1,9 +1,11 @@
/* Set styles used when opening the printer window */ /* Set styles used when opening the printer window */
#print { #print {
margin: 4ex 0px 0px 0px; margin: 0.5ex 0px 0px 0px;
} }
#options { #options, #spacer {
font-family: sans;
font-size: smaller;
position: fixed; position: fixed;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -16,6 +18,11 @@
border-bottom: 1px solid black; border-bottom: 1px solid black;
} }
#spacer {
position: static;
visibility: hidden;
}
@media print { @media print {
body { body {
margin: 0px; margin: 0px;

3
demo/vt100.js
View file

@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 176)" + alert("VT100 Terminal Emulator " + "2.9 (revision 178)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };
@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
(this.autoprint ? ' checked' : '') + '>' + (this.autoprint ? ' checked' : '') + '>' +
'Automatically, print page(s) when job is ready' + 'Automatically, print page(s) when job is ready' +
'</input></div>\n' + '</input></div>\n' +
'<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
'<pre id="print"></pre>\n'; '<pre id="print"></pre>\n';
var autoprint = this.printWin.document.getElementById('autoprint'); var autoprint = this.printWin.document.getElementById('autoprint');
this.addListener(autoprint, 'click', this.addListener(autoprint, 'click',

11
shellinabox/print-styles.css
View file

@ -1,9 +1,11 @@
/* Set styles used when opening the printer window */ /* Set styles used when opening the printer window */
#print { #print {
margin: 4ex 0px 0px 0px; margin: 0.5ex 0px 0px 0px;
} }
#options { #options, #spacer {
font-family: sans;
font-size: smaller;
position: fixed; position: fixed;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -16,6 +18,11 @@
border-bottom: 1px solid black; border-bottom: 1px solid black;
} }
#spacer {
position: static;
visibility: hidden;
}
@media print { @media print {
body { body {
margin: 0px; margin: 0px;

7
shellinabox/shell_in_a_box.js
View file

@ -91,8 +91,10 @@ function extend(subClass, baseClass) {
function ShellInABox(url, container) { function ShellInABox(url, container) {
if (url == undefined) { if (url == undefined) {
this.rooturl = document.location.href;
this.url = document.location.href.replace(/[?#].*/, ''); this.url = document.location.href.replace(/[?#].*/, '');
} else { } else {
this.rooturl = url;
this.url = url; this.url = url;
} }
if (document.location.hash != '') { if (document.location.hash != '') {
@ -168,7 +170,8 @@ ShellInABox.prototype.sendRequest = function(request) {
var content = 'width=' + this.terminalWidth + var content = 'width=' + this.terminalWidth +
'&height=' + this.terminalHeight + '&height=' + this.terminalHeight +
(this.session ? '&session=' + (this.session ? '&session=' +
encodeURIComponent(this.session) : ''); encodeURIComponent(this.session) : '&rooturl='+
encodeURIComponent(this.rooturl));
request.setRequestHeader('Content-Length', content.length); request.setRequestHeader('Content-Length', content.length);
request.onreadystatechange = function(shellInABox) { request.onreadystatechange = function(shellInABox) {
@ -355,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.9 (revision 176)" + alert("Shell In A Box version " + "2.9 (revision 178)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

5
shellinabox/shell_in_a_box.jspp
View file

@ -91,8 +91,10 @@ function extend(subClass, baseClass) {
function ShellInABox(url, container) { function ShellInABox(url, container) {
if (url == undefined) { if (url == undefined) {
this.rooturl = document.location.href;
this.url = document.location.href.replace(/[?#].*/, ''); this.url = document.location.href.replace(/[?#].*/, '');
} else { } else {
this.rooturl = url;
this.url = url; this.url = url;
} }
if (document.location.hash != '') { if (document.location.hash != '') {
@ -168,7 +170,8 @@ ShellInABox.prototype.sendRequest = function(request) {
var content = 'width=' + this.terminalWidth + var content = 'width=' + this.terminalWidth +
'&height=' + this.terminalHeight + '&height=' + this.terminalHeight +
(this.session ? '&session=' + (this.session ? '&session=' +
encodeURIComponent(this.session) : ''); encodeURIComponent(this.session) : '&rooturl='+
encodeURIComponent(this.rooturl));
request.setRequestHeader('Content-Length', content.length); request.setRequestHeader('Content-Length', content.length);
request.onreadystatechange = function(shellInABox) { request.onreadystatechange = function(shellInABox) {

1
shellinabox/shellinaboxd.c
View file

@ -778,6 +778,7 @@ static void usage(void) {
" ${lines} - number of rows\n" " ${lines} - number of rows\n"
" ${peer} - name of remote peer\n" " ${peer} - name of remote peer\n"
" ${uid} - user id\n" " ${uid} - user id\n"
" ${url} - the URL that serves the terminal session\n"
" ${user} - user name\n" " ${user} - user name\n"
"\n" "\n"
"One or more --user-css arguments define optional user-selectable " "One or more --user-css arguments define optional user-selectable "

3
shellinabox/vt100.js
View file

@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 176)" + alert("VT100 Terminal Emulator " + "2.9 (revision 178)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };
@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
(this.autoprint ? ' checked' : '') + '>' + (this.autoprint ? ' checked' : '') + '>' +
'Automatically, print page(s) when job is ready' + 'Automatically, print page(s) when job is ready' +
'</input></div>\n' + '</input></div>\n' +
'<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
'<pre id="print"></pre>\n'; '<pre id="print"></pre>\n';
var autoprint = this.printWin.document.getElementById('autoprint'); var autoprint = this.printWin.document.getElementById('autoprint');
this.addListener(autoprint, 'click', this.addListener(autoprint, 'click',

1
shellinabox/vt100.jspp
View file

@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
(this.autoprint ? ' checked' : '') + '>' + (this.autoprint ? ' checked' : '') + '>' +
'Automatically, print page(s) when job is ready' + 'Automatically, print page(s) when job is ready' +
'</input></div>\n' + '</input></div>\n' +
'<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
'<pre id="print"></pre>\n'; '<pre id="print"></pre>\n';
var autoprint = this.printWin.document.getElementById('autoprint'); var autoprint = this.printWin.document.getElementById('autoprint');
this.addListener(autoprint, 'click', this.addListener(autoprint, 'click',