Merge branch 'bug-1177' into bug-893
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:38:31 +0000 (23:38 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:38:31 +0000 (23:38 +0200)
includes/notary.inc.php
pages/account/43.php

index f703087..929158e 100644 (file)
        {
 ?>
        <tr>
-               <td class="DataTD" colspan="5"><strong><?=$points_txt?>:</strong></td>
+               <td<?=($support == "1")?' colspan="5"':' colspan="3"'?> class="DataTD"><strong><?=$points_txt?>:</strong></td>
                <td class="DataTD"><?=$points?></td>
                <td class="DataTD">&nbsp;</td>
                <td class="DataTD"><strong><?=$experience_txt?>:</strong></td>
                return $issue_points;
        }
 
-       function output_given_assurances($userid,$support)
+       function output_given_assurances($userid,$support=0)
        {
                output_assurances_header(_("Assurance Points You Issued"),$support);
                output_given_assurances_content($userid,$points,$sum_experience,$support);
                output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience,$support);
        }
 
-       function output_received_assurances($userid,$support)
+       function output_received_assurances($userid,$support=0)
        {
                output_assurances_header(_("Your Assurance Points"),$support);
                output_received_assurances_content($userid,$points,$sum_experience,$support);
index 234e01a..841189d 100644 (file)
@@ -837,7 +837,7 @@ function showassuredto()
   </tr>
 <? } ?>
   <tr>
-    <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+    <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
     <td class="DataTD"><?=$points?></td>
     <td class="DataTD" colspan="3">&nbsp;</td>
   </tr>
@@ -883,7 +883,7 @@ function showassuredby()
   </tr>
 <? } ?>
   <tr>
-    <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+    <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
     <td class="DataTD"><?=$points?></td>
     <td class="DataTD" colspan="3">&nbsp;</td>
   </tr>