summaryrefslogtreecommitdiff
path: root/pages
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 /pages
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 'pages')
-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
8 files changed, 16 insertions, 15 deletions
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">