summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-22 00:02:17 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-22 00:02:17 +0100
commitfa68e3ded553ffb0e5808044c457b13c6d6e4d51 (patch)
tree5d5153829bfffca2e92f38661aacf1d2251fa25a /www
parentd2965b141a3ae891b97a086269759bc94bd4bca6 (diff)
parent7fd0b20438735aea8206d27517cd72d8bb2310cd (diff)
downloadcacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.tar.gz
cacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.tar.xz
cacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.zip
Merge branch 'bug-1253' into testserver-stable
Conflicts: includes/tverify_stuff.php pages/account/40.php pages/index/1.php pages/index/11.php
Diffstat (limited to 'www')
-rw-r--r--www/gpg.php6
-rw-r--r--www/styles/default.css18
-rw-r--r--www/wot.php2
3 files changed, 22 insertions, 4 deletions
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)
{