From 7558605f35d6872ddc52252ffcd005dcfc69c271 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 23 Jan 2010 14:41:56 -0800
Subject: [PATCH] Use new API

---
 certmgr/index.cgi | 6 ++----
 fdisk/lang/en     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/certmgr/index.cgi b/certmgr/index.cgi
index f1437443b..ae95a6a81 100755
--- a/certmgr/index.cgi
+++ b/certmgr/index.cgi
@@ -8,10 +8,9 @@ if (! -d $config{'ssl_cert_dir'} ) { system("mkdir -p -m 0755 $config{'ssl_cert_
 if (! -d $config{'ssl_csr_dir'} ) { system("mkdir -p -m 0755 $config{'ssl_csr_dir'}"); }
 if (! -d $config{'ssl_key_dir'} ) { system("mkdir -p -m 0700 $config{'ssl_key_dir'}"); }
 
-&header($text{'index_title'}, "", "intro", 1, 1);
+&ui_print_header(undef, $text{'index_title'}, "", "intro", 1, 1);
 
 print <<EOF;
-<hr>
 <table border>
 <tr $tb> <td align=center><b>$text{'index_header'}</b></td> </tr>
 <tr $cb> <td><table width=100%><tr>
@@ -23,6 +22,5 @@ foreach $p (@pages) {
 	print "</td><td><a href=$p.cgi>$txt</a></td></tr>\n";
 	}
 print "</table></td></tr></table>\n";
-print &ui_hr();
 
-&footer("/", $text{'index_index'});
+&ui_print_footer("/", $text{'index_index'});
diff --git a/fdisk/lang/en b/fdisk/lang/en
index d5f45ffd5..a2a926d1e 100644
--- a/fdisk/lang/en
+++ b/fdisk/lang/en
@@ -83,7 +83,7 @@ edit_notexist=Not created yet
 edit_notused=Not in use
 edit_size=Size
 edit_label=Partition label
-edit_volid=Filesystem ID
+edit_volid=Volume ID
 edit_blocks=$1 blocks
 edit_inuse=This partition cannot be changed as it is currently in use or configured for use.
 edit_mkfs=Create New Filesystem