Browse Source

update with html5 compliant code

Philippe GRAND 6 years ago
parent
commit
be97ad0e3e

+ 26 - 26
htdocs/adherents/index.php

@@ -203,7 +203,7 @@ if ($conf->use_javascript_ajax)
     print $dolgraph->show($total?0:1);
 
     print '</td></tr>';
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
+    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
     print $SommeA+$SommeB+$SommeC+$SommeD;
     print '</td></tr>';
     print '</table>';
@@ -247,9 +247,9 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<th>'.$langs->trans("Subscriptions").'</th>';
-print '<th align="right">'.$langs->trans("Number").'</th>';
-print '<th align="right">'.$langs->trans("AmountTotal").'</th>';
-print '<th align="right">'.$langs->trans("AmountAverage").'</th>';
+print '<th class="right">'.$langs->trans("Number").'</th>';
+print '<th class="right">'.$langs->trans("AmountTotal").'</th>';
+print '<th class="right">'.$langs->trans("AmountAverage").'</th>';
 print "</tr>\n";
 
 krsort($Total);
@@ -257,18 +257,18 @@ foreach ($Total as $key=>$value)
 {
     print '<tr class="oddeven">';
     print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
-    print "<td align=\"right\">".$Number[$key]."</td>";
-    print "<td align=\"right\">".price($value)."</td>";
-    print "<td align=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
+    print "<td class=\"right\">".$Number[$key]."</td>";
+    print "<td class=\"right\">".price($value)."</td>";
+    print "<td class=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
     print "</tr>\n";
 }
 
 // Total
 print '<tr class="liste_total">';
 print '<td>'.$langs->trans("Total").'</td>';
-print "<td align=\"right\">".$numb."</td>";
-print '<td align="right">'.price($tot)."</td>";
-print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
+print "<td class=\"right\">".$numb."</td>";
+print '<td class="right">'.price($tot)."</td>";
+print "<td class=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
 print "</tr>\n";
 print "</table></div>";
 print "<br>\n";
@@ -325,7 +325,7 @@ if ($resql)
 			print '<td>'.$staticmember->getNomUrl(1,32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1,32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem),'dayhour').'</td>';
-			print '<td align="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
+			print '<td class="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -385,9 +385,9 @@ if ($resql)
 			print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
 			print '<td>'.$staticmember->getNomUrl(1,32,'subscription').'</td>';
 			print '<td>'.get_date_range($db->jdate($obj->date_start),$db->jdate($obj->date_end)).'</td>';
-			print '<td align="right">'.price($obj->subscription).'</td>';
-			//print '<td align="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
-			print '<td align="right">'.dol_print_date($db->jdate($obj->datem?$obj->datem:$obj->datec),'dayhour').'</td>';
+			print '<td class="right">'.price($obj->subscription).'</td>';
+			//print '<td class="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';
+			print '<td class="right">'.dol_print_date($db->jdate($obj->datem?$obj->datem:$obj->datec),'dayhour').'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -406,28 +406,28 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<th>'.$langs->trans("MembersTypes").'</th>';
-print '<th align=right>'.$langs->trans("MembersStatusToValid").'</th>';
-print '<th align=right>'.$langs->trans("MenuMembersNotUpToDate").'</th>';
-print '<th align=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
-print '<th align=right>'.$langs->trans("MembersStatusResiliated").'</th>';
+print '<th class=right>'.$langs->trans("MembersStatusToValid").'</th>';
+print '<th class=right>'.$langs->trans("MenuMembersNotUpToDate").'</th>';
+print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
+print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
 foreach ($AdherentType as $key => $adhtype)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
-	print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
-	print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
-	print '<td align="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).'</td>';
-	print '<td align="right">'.(isset($MembersResiliated[$key]) && $MembersResiliated[$key]> 0 ?$MembersResiliated[$key]:'').' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).'</td>';
+	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
+	print '<td class="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
+	print '<td class="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).'</td>';
+	print '<td class="right">'.(isset($MembersResiliated[$key]) && $MembersResiliated[$key]> 0 ?$MembersResiliated[$key]:'').' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).'</td>';
 	print "</tr>\n";
 }
 print '<tr class="liste_total">';
 print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-print '<td class="liste_total" align="right">'.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
-print '<td class="liste_total" align="right">'.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
-print '<td class="liste_total" align="right">'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).'</td>';
-print '<td class="liste_total" align="right">'.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).'</td>';
+print '<td class="liste_total" class="right">'.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
+print '<td class="liste_total" class="right">'.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
+print '<td class="liste_total" class="right">'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->subscription,$now,3).'</td>';
+print '<td class="liste_total" class="right">'.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->subscription,0,3).'</td>';
 print '</tr>';
 
 print "</table>\n";

+ 1 - 1
htdocs/adherents/list.php

@@ -870,7 +870,7 @@ if (isset($totalarray['pos']))
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		if (! empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		else
 		{
 			if ($i == 1)

+ 5 - 5
htdocs/adherents/subscription.php

@@ -610,7 +610,7 @@ if ($rowid > 0)
 	print '</td>';
 	if ($action != 'editlogin' && $user->rights->adherent->creer)
 	{
-		print '<td align="right">';
+		print '<td class="right">';
 		if ($user->rights->user->user->creer)
 		{
 			print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
@@ -695,10 +695,10 @@ if ($rowid > 0)
             print '<td align="center">'.$langs->trans("DateCreation").'</td>';
             print '<td align="center">'.$langs->trans("DateStart").'</td>';
             print '<td align="center">'.$langs->trans("DateEnd").'</td>';
-            print '<td align="right">'.$langs->trans("Amount").'</td>';
+            print '<td class="right">'.$langs->trans("Amount").'</td>';
             if (! empty($conf->banque->enabled))
             {
-                print '<td align="right">'.$langs->trans("Account").'</td>';
+                print '<td class="right">'.$langs->trans("Account").'</td>';
             }
             print "</tr>\n";
 
@@ -716,10 +716,10 @@ if ($rowid > 0)
                 print '<td align="center">'.dol_print_date($db->jdate($objp->datec),'dayhour')."</td>\n";
                 print '<td align="center">'.dol_print_date($db->jdate($objp->dateh),'day')."</td>\n";
                 print '<td align="center">'.dol_print_date($db->jdate($objp->datef),'day')."</td>\n";
-                print '<td align="right">'.price($objp->subscription).'</td>';
+                print '<td class="right">'.price($objp->subscription).'</td>';
 				if (! empty($conf->banque->enabled))
 				{
-					print '<td align="right">';
+					print '<td class="right">';
 					if ($objp->bid)
 					{
 						$accountstatic->label=$objp->label;

+ 2 - 2
htdocs/adherents/subscription/list.php

@@ -541,7 +541,7 @@ while ($i < min($num, $limit))
 	// Price
 	if (! empty($arrayfields['d.amount']['checked']))
 	{
-		print '<td align="right">'.price($obj->subscription).'</td>';
+		print '<td class="right">'.price($obj->subscription).'</td>';
 		if (! $i) $totalarray['nbfield']++;
 		if (! $i) $totalarray['pos'][$totalarray['nbfield']]='d.amount';
 		$totalarray['val']['d.amount'] += $obj->subscription;
@@ -591,7 +591,7 @@ if (isset($totalarray['pos']))
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		if (! empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		else
 		{
 			if ($i == 1)

+ 3 - 3
htdocs/adherents/tpl/linkedobjectblock.tpl.php

@@ -46,13 +46,13 @@ foreach($linkedObjectBlock as $key => $objectlink)
     <td><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td align="center"></td>
 	<td align="center"><?php echo dol_print_date($objectlink->dateh,'day'); ?></td>
-	<td align="right"><?php
+	<td class="right"><?php
 		if ($user->rights->adherent->lire) {
 			$total = $total + $objectlink->amount;
 			echo price($objectlink->amount);
 		} ?></td>
-	<td align="right"></td>
-	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"></td>
+	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 <?php
 }

+ 2 - 2
htdocs/adherents/type.php

@@ -279,9 +279,9 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 			print '<td align="center">'.yn($objp->subscription).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
 			if ($user->rights->adherent->configurer)
-				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
 			else
-				print '<td align="right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
 			print "</tr>";
 			$i++;
 		}