From 3c644e1c4c1fd57d6f57629c503edc673ed9fbf7 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Sat, 21 Nov 2009 21:01:32 +0000 Subject: [PATCH] Document the --user-css command line option. Added an example on how to configure Apache for reverse proxy operation. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@185 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- config.h | 2 +- configure | 2 +- configure.ac | 2 +- debian/README.available | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/shellinaboxd.man.in | 120 ++++++++++++++++++++++++++++++-- shellinabox/vt100.js | 2 +- 8 files changed, 123 insertions(+), 11 deletions(-) diff --git a/config.h b/config.h index 0b212bc..6b640f1 100644 --- a/config.h +++ b/config.h @@ -138,7 +138,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "183" +#define VCS_REVISION "185" /* Version number of package */ #define VERSION "2.9" diff --git a/configure b/configure index ffb1043..f2ddac4 100755 --- a/configure +++ b/configure @@ -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 -VCS_REVISION=183 +VCS_REVISION=185 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index dba9928..1f349c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.9, markus@shellinabox.com) -VCS_REVISION=183 +VCS_REVISION=185 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/debian/README.available b/debian/README.available index f438e40..fa76d0f 100644 --- a/debian/README.available +++ b/debian/README.available @@ -8,7 +8,7 @@ restart the daemon with "sudo /etc/init.d/shellinabox restart". All options are of the form "ID_Name of Option.css". Any options with identical IDs will be put into the same option group. They are -mutually exclusive and only one such option can selected at any given +mutually exclusive and only one such option can be selected at any given time. Please note that ':', ',', and ';' are all invalid characters in diff --git a/demo/vt100.js b/demo/vt100.js index 35f4a3e..a66db58 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.9 (revision 183)" + + alert("VT100 Terminal Emulator " + "2.9 (revision 185)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 13ccd10..2333bc2 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.9 (revision 183)" + + alert("Shell In A Box version " + "2.9 (revision 185)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/shellinaboxd.man.in b/shellinabox/shellinaboxd.man.in index e4d3142..18b647d 100644 --- a/shellinabox/shellinaboxd.man.in +++ b/shellinabox/shellinaboxd.man.in @@ -44,7 +44,7 @@ .\" The most up-to-date version of this program is always available from .\" http://shellinabox.com .\" -.TH SHELLINABOXD 1 "Dec 25, 2008" +.TH SHELLINABOXD 1 "Nov 21, 2009" .SH NAME shellinaboxd \- publish command line shell through AJAX interface .SH SYNOPSIS @@ -73,6 +73,7 @@ shellinaboxd \- publish command line shell through AJAX interface [\ \fB--disable-ssl-menu\fP\ ] [\ \fB-q\fP\ | \fB--quiet\fP\ ] [\ \fB-u\fP\ | \fB--user=\fP\fIuid\fP\ ] +[\ \fB--user-css=\fP\fIstyles\fP\ ] [\ \fB-v\fP\ | \fB--verbose\fP\ ] [\ \fB--version\fP\ ] .SH DESCRIPTION @@ -486,6 +487,44 @@ For more details, refer to the description of the .B --group option. .TP +\fB--user-css=\fP\fIstyles\fP +The visual appearance of the terminal emulator can be customized +through user-selectable style sheets. These style sheets will show up +as options in the right-click context menu of the terminal emulator. + +Styles sheet make up either independently selectable on/off options, +or multiple style sheets can be grouped together. When forming a group, +only one member of the group can be active at any given time. This is +used for multiple-choice options. + +Multiple independent groups are separated by semicolons: +.in +4 +\fISTYLES\fP := \fIGROUP\fP { ';' \fIGROUP\fP }* +.in + +The members of a group are separated by commas: +.in +4 +\fIGROUP\fP := \fIOPTION\fP { ',' OPTION }* +.in + +Groups with exactly one member are used for options that can be +independently turned on and off. + +Options include a human readable label that will be shown in the +context menu, followed by the name of the CSS file. They also must +include an indicator showing whether the option should initially be +turned on or turned off. Within a group, exactly one option should be +turned on: +.in +4 +\fIOPTION\fP :=