From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e851b1c35c1a7962a9087b7e0c78fb1410c42037
Date: Thu, 20 Sep 2012 16:14:16 +0200 [thread overview]
Message-ID: <20120920141416.4313B20099@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2874 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e851b1c35c1a7962a9087b7e0c78fb1410c42037 (commit)
via e5d406ab9edb68599069389ee39f333d77fc68fe (commit)
from 6de056b1de4b8dc507a54dc8200c94d4dff0841c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e851b1c35c1a7962a9087b7e0c78fb1410c42037
Merge: e5d406a 6de056b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 20 16:14:03 2012 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit e5d406ab9edb68599069389ee39f333d77fc68fe
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Thu Sep 20 16:13:31 2012 +0200
index.cgi: Fix HTML syntax.
Bug #10225.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/index.cgi | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 04a87cf..6919c8c 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -241,19 +241,22 @@ END
print <<END;
+
<!-- Table of networks -->
<table border='0' width=80%>
- <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
- <th bgcolor='$color{'color20'}'>IP
- <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
- <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br>
- <td width='30%' align='center'>$ipaddr
- <td width='45%' align='center'>$connstate
+ <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
+ <th bgcolor='$color{'color20'}'>IP</th>
+ <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
+ <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
+ <td width='30%' align='center'>$ipaddr </td>
+ <td width='45%' align='center'>$connstate
END
if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
print `/usr/local/bin/dialctrl.pl show`;
print <<END;
- <tr><td colspan='2'>
+ </td></tr>
+ <tr><td colspan='2'>
+
<form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
<select name='PROFILE'>
END
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-09-20 14:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120920141416.4313B20099@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox