Update of /cvsroot/leaf/src/config/webconf/var/webconf/www
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24285
Modified Files:
blurb.ipsec_name blurb.ipsec_rsa ipsec.cgi ipsec_conn.cgi
Log Message:
Use tooltips for ipsec_conn.cgi
Index: ipsec.cgi
===================================================================
RCS file: /cvsroot/leaf/src/config/webconf/var/webconf/www/ipsec.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ipsec.cgi 10 Jun 2009 06:41:11 -0000 1.1
--- ipsec.cgi 22 Jun 2009 11:07:03 -0000 1.2
***************
*** 48,51 ****
--- 48,57 ----
EOF
######################################################################
+ # insert the javascript functions for the tooltips
+ ######################################################################
+ cat <<-EOF
+ <script type="text/javascript" src="wz_tooltip.js"></script>
+ EOF
+ ######################################################################
######################################################################
***************
*** 188,192 ****
;;
Up)
! [ "X$FORM_connectionname" != "X" ] && up_connection
$FORM_connectionname
;;
Down)
--- 194,200 ----
;;
Up)
! [ -s $CONNECTION_FILE ] && init_ipsec_values
$CONNECTION_FILE
! [ "X$FORM_connectionname" != "X" -a "$CONFIG_auto" ==
"add" ] && listen_connection $FORM_connectionname
! [ "X$FORM_connectionname" != "X" -a "$CONFIG_auto" ==
"start" ] && up_connection $FORM_connectionname
;;
Down)
Index: blurb.ipsec_name
===================================================================
RCS file: /cvsroot/leaf/src/config/webconf/var/webconf/www/blurb.ipsec_name,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** blurb.ipsec_name 10 Jun 2009 06:44:02 -0000 1.1
--- blurb.ipsec_name 22 Jun 2009 11:07:03 -0000 1.2
***************
*** 1 ****
! Use alphanumeric characters only
--- 1 ----
! Enter a unique name to ientify this connection. Use alphanumeric characters
only.
Index: ipsec_conn.cgi
===================================================================
RCS file: /cvsroot/leaf/src/config/webconf/var/webconf/www/ipsec_conn.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ipsec_conn.cgi 10 Jun 2009 06:43:02 -0000 1.1
--- ipsec_conn.cgi 22 Jun 2009 11:07:03 -0000 1.2
***************
*** 15,33 ****
<% #
- WEBCONF_DIR=/var/webconf
- TEMPLATE_DIR=$WEBCONF_DIR/templates
- FILTERDIR=$WEBCONF_DIR/lib/filter
- IPSEC_CONN_TEMPLATE=$TEMPLATE_DIR/ipsec_conn
- IPSEC_BLURB=$WEBCONF_DIR/www/blurb.ipsec_conn
- NAME_BLURB=$WEBCONF_DIR/www/blurb.ipsec_name
- TIMEOUT_BLURB=$WEBCONF_DIR/www/blurb.ipsec_timeout
- DPD_BLURB=$WEBCONF_DIR/www/blurb.ipsec_dpd
- RSA_BLURB=$WEBCONF_DIR/www/blurb.ipsec_rsa
- PHASE1_BLURB=$WEBCONF_DIR/www/blurb.ipsec_phase1
- PHASE2_BLURB=$WEBCONF_DIR/www/blurb.ipsec_phase2
-
. /var/webconf/lib/validator.sh # Sets colours CL0 to CL4
. /var/webconf/lib/ipsec.func
######################################################################
# this is for the calls to ifup/down and ip
--- 15,27 ----
<% #
. /var/webconf/lib/validator.sh # Sets colours CL0 to CL4
. /var/webconf/lib/ipsec.func
+ USE_TOOLTIPS=1
+ if [ -r /var/webconf/lib/tooltip.func ] ; then
+ . /var/webconf/lib/tooltip.func
+ USE_TOOLTIPS=0
+ fi
+
######################################################################
# this is for the calls to ifup/down and ip
***************
*** 46,49 ****
--- 40,49 ----
EOF
######################################################################
+ # insert the javascript functions for the tooltips
+ ######################################################################
+ [ -f wz_tooltip.js -a $USE_TOOLTIPS -eq 0 ] && cat <<-EOF
+ <script type="text/javascript" src="wz_tooltip.js"></script>
+ EOF
+ ######################################################################
######################################################################
# insert the ipsec css file
***************
*** 56,61 ****
TEMP=/tmp/$SCRIPT_NAME$$
- TEMP=/tmp/$SCRIPT_NAME$$
-
cat <<-EOF
<form name="$SCRIPT_NAME_form" action="ipsec.cgi" method=post
--- 56,59 ----
***************
*** 92,103 ****
<label for="connectionname" class=info>Connection Name</label>
</td><td>
! <input class=ipsec_input name="connectionname" size="30"
value="$FORM_connectionname">
! </td>
!
! <td colspan= 2valign=top>
! <div class=ipsec_conn_txt>
EOF
! [ -s $NAME_BLURB ] && cat $NAME_BLURB
cat <<-EOF
</div>
</td>
--- 90,98 ----
<label for="connectionname" class=info>Connection Name</label>
</td><td>
! <input class=ipsec_input name="connectionname" size="30"
value="$FORM_connectionname"
EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $NAME_BLURB
cat <<-EOF
+ >
</div>
</td>
***************
*** 108,112 ****
<label for="left" class=info>Local Interface</label>
</td><td>
! <input class=ipsec_input name="left" size="30" value="$CONFIG_left">
</td></tr>
--- 103,111 ----
<label for="left" class=info>Local Interface</label>
</td><td>
! <input class=ipsec_input name="left" size="30" value="$CONFIG_left"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $LEFT_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 114,118 ****
<label for="leftsubnet" class=info>Local Subnet</label>
</td><td>
! <input class=ipsec_input name="leftsubnet" size="30"
value="$CONFIG_leftsubnet">
</td></tr>
--- 113,121 ----
<label for="leftsubnet" class=info>Local Subnet</label>
</td><td>
! <input class=ipsec_input name="leftsubnet" size="30"
value="$CONFIG_leftsubnet"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $LEFTSUBNET_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 120,124 ****
<label for="leftid" class=info>Local Identification</label>
</td><td colspan=3>
! <input class=ipsec_input name="leftid" size="100"
value="$CONFIG_leftid">
</td></tr>
--- 123,131 ----
<label for="leftid" class=info>Local Identification</label>
</td><td colspan=3>
! <input class=ipsec_input name="leftid" size="100" value="$CONFIG_leftid"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $LEFTID_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 126,130 ****
<label for="right" class=info>Remote IP</label>
</td><td>
! <input class=ipsec_input name="right" size="30" value="$CONFIG_right">
</td></tr>
--- 133,141 ----
<label for="right" class=info>Remote IP</label>
</td><td>
! <input class=ipsec_input name="right" size="30" value="$CONFIG_right"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $RIGHT_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 132,136 ****
<label for="rightsubnet" class=info>Remote Subnet</label>
</td><td>
! <input class=ipsec_input name="rightsubnet" size="30"
value="$CONFIG_rightsubnet">
</td></tr>
--- 143,151 ----
<label for="rightsubnet" class=info>Remote Subnet</label>
</td><td>
! <input class=ipsec_input name="rightsubnet" size="30"
value="$CONFIG_rightsubnet"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $RIGHTSUBNET_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 138,142 ****
<label for="rightid" class=info>Remote Identification</label>
</td><td colspan=3>
! <input class=ipsec_input_wide name="rightid" size="100"
value="$CONFIG_rightid">
</td></tr>
--- 153,161 ----
<label for="rightid" class=info>Remote Identification</label>
</td><td colspan=3>
! <input class=ipsec_input_wide name="rightid" size="100"
value="$CONFIG_rightid"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $ID_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 446,450 ****
<label for="old_leftcert" class=info>Local certificate</label>
</td><td>
! <input class=ipsec_input name="old_leftcert" size="30"
value="$CONFIG_leftcert">
</td></tr>
--- 465,473 ----
<label for="old_leftcert" class=info>Local certificate</label>
</td><td>
! <input class=ipsec_input name="old_leftcert" size="30"
value="$CONFIG_leftcert"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $LEFTCERT_BLURB
! cat <<-EOF
! >
</td></tr>
***************
*** 457,469 ****
<label for="leftrsasigkey" class=info>Local RSA key</label>
</td><td>
! <input class=ipsec_input name="leftrsasigkey" size="30"
value="$CONFIG_leftrsasigkey">
! </td>
!
! <td rowspan=3 colspan=2 valign=top>
! <div class=ipsec_conn_txt>
EOF
! [ -s $RSA_BLURB ] && cat $RSA_BLURB
cat <<-EOF
! </div>
</td>
</tr>
--- 480,488 ----
<label for="leftrsasigkey" class=info>Local RSA key</label>
</td><td>
! <input class=ipsec_input name="leftrsasigkey" size="30"
value="$CONFIG_leftrsasigkey"
EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $RSA_BLURB
cat <<-EOF
! >
</td>
</tr>
***************
*** 472,476 ****
<label for="rightrsasigkey" class=info>Remote RSA key</label>
</td><td>
! <input class=ipsec_input name="rightrsasigkey" size="30"
value="$CONFIG_rightrsasigkey">
</td></tr>
--- 491,499 ----
<label for="rightrsasigkey" class=info>Remote RSA key</label>
</td><td>
! <input class=ipsec_input name="rightrsasigkey" size="30"
value="$CONFIG_rightrsasigkey"
! EOF
! [ $USE_TOOLTIPS -eq 0 ] && tooltip_from_file $RSA_BLURB
! cat <<-EOF
! >
</td></tr>
Index: blurb.ipsec_rsa
===================================================================
RCS file: /cvsroot/leaf/src/config/webconf/var/webconf/www/blurb.ipsec_rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** blurb.ipsec_rsa 10 Jun 2009 06:44:02 -0000 1.1
--- blurb.ipsec_rsa 22 Jun 2009 11:07:03 -0000 1.2
***************
*** 1,2 ****
! The RSA signature values typically default to %cert for both sides.
! Unless you know what you are doing, leave these entries alone.
--- 1,2 ----
! The RSA signature values typically default to %cert for both sides. Unless
you know what you are doing, leave these entries alone.
!
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
