summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/account_stuff.php2
-rw-r--r--includes/general_stuff.php2
-rw-r--r--includes/shutdown.php4
-rw-r--r--pages/account/14.php6
-rw-r--r--pages/index/0.php2
-rw-r--r--pages/index/1.php7
-rw-r--r--pages/index/6.php6
-rw-r--r--pages/wot/1.php2
-rw-r--r--pages/wot/5.php4
-rw-r--r--pages/wot/8.php2
-rw-r--r--pages/wot/9.php2
-rw-r--r--www/gpg.php6
-rw-r--r--www/styles/default.css18
-rw-r--r--www/wot.php2
14 files changed, 42 insertions, 23 deletions
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 096315d..da328a3 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -270,7 +270,7 @@ function hideall() {
<div class="story">
<h3><?=$title2?></h3>
<? if($_SESSION['_config']['errmsg'] != "") { ?>
-<p><font color="#ff0000" size="+2"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
+<p class="error_fatal"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?></p>
<? } ?>
<?
}
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 10c4e0a..19c3d2f 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -80,7 +80,7 @@ google_color_border = "FFFFFF";
<div class="story">
<? if($title2!="") echo "<h3>$title2</h3>"; ?>
<? if($_SESSION['_config']['errmsg'] != "") { ?>
-<p><font color="#ff0000" size="+2"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
+<p class="error_fatal"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?></p>
<? } ?>
<?
diff --git a/includes/shutdown.php b/includes/shutdown.php
index 4ceaf25..03b7814 100644
--- a/includes/shutdown.php
+++ b/includes/shutdown.php
@@ -21,8 +21,8 @@
if(0)
{ ?>
- <font color="#ff0000"><? printf(_("This function is currently disabled. Please visit %s for more information."),
- "<a target='_blank' href='http://wiki.cacert.org/wiki/ClientSecurity'>http://wiki.cacert.org/wiki/ClientSecurity</a>")?></font>
+ <span class="error_fatal"><? printf(_("This function is currently disabled. Please visit %s for more information."),
+ "<a target='_blank' href='http://wiki.cacert.org/wiki/ClientSecurity'>http://wiki.cacert.org/wiki/ClientSecurity</a>")?></span>
<?
exit;
}
diff --git a/pages/account/14.php b/pages/account/14.php
index 29aeb21..97f6f05 100644
--- a/pages/account/14.php
+++ b/pages/account/14.php
@@ -37,15 +37,15 @@
</tr>
<? } ?>
<tr>
- <td class="DataTD"><?=_("New Pass Phrase")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("New Pass Phrase")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="pword1"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Pass Phrase Again")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("Pass Phrase Again")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="pword2"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol (all white spaces at the beginning and end are removed).")?></td>
+ <td class="DataTD" colspan="2"><span class="error_indicator">*</span><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol (all white spaces at the beginning and end are removed).")?></td>
</tr>
<tr>
<td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update Pass Phrase")?>"></td>
diff --git a/pages/index/0.php b/pages/index/0.php
index de5cb7c..5cd0afc 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -27,7 +27,7 @@
<?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
-<? if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn']) echo "<font size='+1'>"._("Most CAcert functions are currently unavailable. Please come back later.")."</font>";?>
+<? if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn']) echo "<span class=\"error_fatal\">"._("Most CAcert functions are currently unavailable. Please come back later.")."</span>";?>
diff --git a/pages/index/1.php b/pages/index/1.php
index 05e59df..5370d8f 100644
--- a/pages/index/1.php
+++ b/pages/index/1.php
@@ -94,17 +94,18 @@
</tr>
<tr>
- <td class="DataTD"><?=_("Pass Phrase")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("Pass Phrase")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="pword1" size="30" tabindex="10" autocomplete="off"></td>
<td class="DataTD" rowspan="2">&nbsp;</td>
</tr>
+
<tr>
- <td class="DataTD"><?=_("Pass Phrase Again")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("Pass Phrase Again")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="pword2" size="30" tabindex="11" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
+ <td class="DataTD" colspan="3"><span class="error_indicator">*</span><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
</tr>
<tr>
diff --git a/pages/index/6.php b/pages/index/6.php
index fe57d81..22b7711 100644
--- a/pages/index/6.php
+++ b/pages/index/6.php
@@ -79,15 +79,15 @@
</tr>
<? } ?>
<tr>
- <td class="DataTD"><?=_("New Pass Phrase")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("New Pass Phrase")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="newpass1" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Repeat")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?=_("Repeat")?><span class="error_indicator">*</span>: </td>
<td class="DataTD"><input type="password" name="newpass2" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
+ <td class="DataTD" colspan="2"><span class="error_indicator">*</span><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
</tr>
<tr>
<td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
diff --git a/pages/wot/1.php b/pages/wot/1.php
index 9047f27..8062f38 100644
--- a/pages/wot/1.php
+++ b/pages/wot/1.php
@@ -112,7 +112,7 @@
<td class="DataTD"><?=maxpoints($row['id'])?></td>
<td class="DataTD"><?=sanitizeHTML($row['contactinfo'])?></td>
<td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=intval($row['id'])?>"><?=_("Email Me")?></a></td>
- <td class="DataTD"><?=$row['assurer']?_("Yes"):("<font color=\"#ff0000\">"._("Not yet!")."</font>")?></td>
+ <td class="DataTD"><?=$row['assurer']?_("Yes"):("<span class=\"error_indicator\">"._("Not yet!")."</span>")?></td>
</tr>
<?
}
diff --git a/pages/wot/5.php b/pages/wot/5.php
index 565dd6a..01737e1 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -21,9 +21,9 @@
<?
if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
{
- ?><font color="orange" size="+1">
+ ?><span class="error_warning">
<? echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
- </font>
+ </span>
<?unset($_SESSION['_config']['error']);
}
diff --git a/pages/wot/8.php b/pages/wot/8.php
index af67d0b..8b1e0e2 100644
--- a/pages/wot/8.php
+++ b/pages/wot/8.php
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><font color="#ff0000">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?>
+<? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><span class="error_fatal">ERROR: <?=$_SESSION['_config']['error']?></span><? unset($_SESSION['_config']['error']); } ?>
<form method="post" action="wot.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
diff --git a/pages/wot/9.php b/pages/wot/9.php
index 20f2c6d..7f030a0 100644
--- a/pages/wot/9.php
+++ b/pages/wot/9.php
@@ -35,7 +35,7 @@
$_SESSION['_config']['pagehash'] = md5(date("U"));
?>
-<? if($_SESSION['_config']['error'] != "") { ?><font color="#ff0000" size="+1">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?>
+<? if($_SESSION['_config']['error'] != "") { ?><span class="error_fatal">ERROR: <?=$_SESSION['_config']['error']?></span><? unset($_SESSION['_config']['error']); } ?>
<form method="post" action="wot.php">
<input type="hidden" name="userid" value="<?=intval($user['id'])?>">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
diff --git a/www/gpg.php b/www/gpg.php
index 2f7aa83..f7dfde8 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -547,7 +547,7 @@ function verifyEmail($email)
if($npubs>1)
{
showheader(_("Welcome to CAcert.org"));
- echo "<font color='#ff0000'>"._("Please upload only one key at a time.")."</font>";
+ echo "<span class=\"error_indicator\">"._("Please upload only one key at a time.")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
@@ -571,7 +571,7 @@ function verifyEmail($email)
{
showheader(_("Welcome to CAcert.org"));
- echo "<font color='#ff0000'>"._("Multiple Email Adresses per UID are not allowed.")."</font>";
+ echo "<span class=\"error_indicator\">"._("Multiple Email Adresses per UID are not allowed.")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
@@ -679,7 +679,7 @@ function verifyEmail($email)
showheader(_("Welcome to CAcert.org"));
echo $resulttable;
- echo "<font color='#ff0000'>"._("No valid UIDs found on your key")."</font>";
+ echo "<span class=\"error_indicator\">"._("No valid UIDs found on your key")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
diff --git a/www/styles/default.css b/www/styles/default.css
index 097f003..f178a37 100644
--- a/www/styles/default.css
+++ b/www/styles/default.css
@@ -644,6 +644,24 @@ td.greytxt {
font-size: 10px;
}
+/************** error and warning styles ****************/
+
+.error_fatal {
+ font-size: x-large;
+ color: #ff0000;
+ font-family: Arial,sans-serif;
+}
+
+.error_warning {
+ font-size: large;
+ color: #ffa500;
+ font-family: Arial,sans-serif;
+}
+
+.error_indicator, .warning_indicator {
+ color: #ff0000;
+}
+
/************** sponsorInfo styles ****************/
diff --git a/www/wot.php b/www/wot.php
index cc8986c..a7195e3 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -27,7 +27,7 @@ function show_page($target,$message,$error)
if ($error != "")
$message=_("ERROR").": ".$error;
if ($message != "")
- echo "<p><font color='orange' size='+1'>".$message."</font></p>";
+ echo "<p class=\"error_warning\">".$message."</p>";
switch ($target)
{