summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-10-23 19:48:36 +0200
committerBenny Baumann <BenBE@geshi.org>2013-10-23 19:48:36 +0200
commit234b43aca01ba78b9aff492591f84187ca12a664 (patch)
tree08f6140ed0b68e91d55167f3f6bdd9f9bf78987a
parent837b2b59f77a68afe7bebeecac381a0190a5ab3c (diff)
parentdf55d38af2e9c613d1392611314b249995c3d971 (diff)
downloadcacert-devel-234b43aca01ba78b9aff492591f84187ca12a664.tar.gz
cacert-devel-234b43aca01ba78b9aff492591f84187ca12a664.tar.xz
cacert-devel-234b43aca01ba78b9aff492591f84187ca12a664.zip
Merge branch 'bug-411' into release
-rw-r--r--pages/account/12.php7
-rw-r--r--pages/account/5.php2
2 files changed, 7 insertions, 2 deletions
diff --git a/pages/account/12.php b/pages/account/12.php
index 6d85cdc..9058a07 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -19,7 +19,7 @@
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+ <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
</tr>
<tr>
<td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
@@ -86,6 +86,11 @@
<? } ?>
<tr>
<td class="DataTD" colspan="8">
+ <a href="account.php?id=12&amp;viewall=<?=!$viewall?>"><b><?=$viewall?_("Hide old certificates"):_("View all certificates")?></b></a>
+ </td>
+ </tr>
+ <tr>
+ <td class="DataTD" colspan="8">
<?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
</td>
</tr>
diff --git a/pages/account/5.php b/pages/account/5.php
index 9607850..44763e2 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -19,7 +19,7 @@
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="10" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&amp;viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td>
+ <td colspan="10" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&amp;viewall=<?=!$viewall?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
</tr>
<tr>
<td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>