Correction structure html

This commit is contained in:
Michael RICOIS 2010-04-22 16:47:51 +00:00
parent 084d07d339
commit dfc0301aaf
3 changed files with 42 additions and 35 deletions

View File

@ -5,4 +5,14 @@ function lienTri($tri, $vue, $source, $siret, $idEntreprise)
$output.= isset($source) ? '&source='.$source : '' ;
$output.= '&tri='.$tri.'&idEntreprise='.$idEntreprise.'&siret='.$siret;
return $output;
}
function lienPage($tri, $vue, $source, $siret, $idEntreprise, $position){
$output = './?page=surveillance&vue='.$vue;
$output.= isset($tri) ? '&tri='.$tri : '';
$output.= isset($source) ? '&source='.$source : '';
$output.= '&idEntreprise='.$idEntreprise;
$output.= '&siret='.$siret;
$output.= '&p='.$position;
return $output;
}

View File

@ -16,7 +16,7 @@ table.tablesorter thead tr .header { background:url(../img/bg.gif) no-repeat cen
table.tablesorter thead tr .headerSortUp { background-image: url(../img/asc.gif); }
table.tablesorter thead tr .headerSortDown { background-image: url(../img/desc.gif); }
#tri li {list-syle:none; margin-left:10px; display:inline; font-size:11px; }
p.options { margin-left:10px; margin-top:5px; font-size:11px; }
.options { margin-left:10px; margin-top:5px; font-size:11px; }
#telechargementjsMsg { margin-left:10px; margin-top:5px; }
.valign img, .valign span {
vertical-align: middle;

View File

@ -153,11 +153,11 @@ if($vue=='default'){
<?php
foreach ($tabSource as $s => $perm) {
if (hasPerm('surv'.$perm)) {
print '<option value="'.$s.'"';
echo '<option value="'.$s.'"';
if (isset($source) && $source == $s) {
print 'selected';
echo 'selected';
}
print '>'.$s.'</option>';
echo '>'.$s.'</option>';
}
}
?>
@ -179,11 +179,11 @@ if($vue=='default'){
<?php
foreach($tabSource as $s => $perm) {
if (hasPerm('surv'.$perm)) {
print '<option value="'.$s.'"';
echo '<option value="'.$s.'"';
if (isset($source) && $source == $s) {
print 'selected';
echo 'selected';
}
print '>'.$s.'</option>';
echo '>'.$s.'</option>';
}
}
?>
@ -192,20 +192,19 @@ if($vue=='default'){
<script type="text/javascript">
$(document).ready(function() {
$("select[name=type]").change(function() {
var value = $(this).val();
if (value == '-') {
$(location).attr('href', './?page=surveillance');
} else {
$(location).attr('href',
'./?page=surveillance&vue=source&source=' +
value + '');
}
});
$("select[name=type]").change(function() {
var value = $(this).val();
if (value == '-') {
$(location).attr('href', './?page=surveillance');
} else {
$(location).attr('href',
'./?page=surveillance&vue=source&source=' + value + '');
}
});
});
</script>
<p class="options">
<div class="options">
<ul id="tri">
<li>
<a href="<?=lienTri('siren', $vue, $source, $siret, $idEntreprise)?>">
@ -227,7 +226,7 @@ Tri par Référence
</li>
<li>
<a href="<?=lienTri('dateajout', $vue, $source, $siret, $idEntreprise)?>">
Tri par Date d&apos;ajout
Tri par Date d'ajout
</a>
</li>
<li>
@ -239,7 +238,7 @@ Tri par Date de dernier envoi
}
?>
</ul>
</p>
</div>
<p class="options">
Les options de tri pemettent de trier la liste de vos surveillances.
Il est ensuite possible de trier les surveillances affichées dans le tableau en
@ -265,13 +264,11 @@ if($totPage != 1)
//}else{
?>
&nbsp;<a href="./?page=surveillance&vue=<?=$vue?>
<?=isset($tri) ? '&tri='.$tri : '';?>
<?=isset($source) ? '&source='.$source : '';?>
&idEntreprise=<?=$idEntreprise?>
&siret=<?=$siret?>
&p=<?=$nbReponses*$countPage?>">
<?=$countPage+1?></a>&nbsp;
&nbsp;<a href="<?php
echo lienPage(
$tri, $vue, $source, $siret,
$idEntreprise, $nbReponses*$countPage);
?>"><?=$countPage+1?></a>&nbsp;
<?php
//}
}
@ -322,7 +319,7 @@ foreach($listTrier as $item)
foreach($item['sources'][$source] as $surveillance)
{
if($surveillance['ref']!=''){
print '<p>'.$surveillance['ref'].'</p>';
echo '<p>'.$surveillance['ref'].'</p>';
}else{?> <p>-</p> <?php }
}
}else{?> <p>-</p> <?php }
@ -330,7 +327,7 @@ foreach($listTrier as $item)
}
?>
</td>
<td id="type" class="aleft">
<td class="aleft">
<?php
foreach($tabSource as $source => $perm)
{
@ -342,8 +339,8 @@ foreach($listTrier as $item)
foreach($item['sources'][$source] as $surveillance)
{
?>
<div id="a<?php print $item['siren'];?>" class="action">
<p><?php print ucfirst($source);?></p>
<div class="action">
<p><?=ucfirst($source)?></p>
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?=$source?>"
title="Ajouter la surveillance <?=$source?>">
<img src="./img/interface/ajouter.png"/>
@ -363,7 +360,7 @@ foreach($listTrier as $item)
else
{
?>
<div id="a<?=$item['siren']?>" class="action">
<div class="action">
<p><?=ucfirst($source)?></p>
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $source;?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
</div>
@ -425,8 +422,8 @@ foreach($listTrier as $item){
?>
</td>
<td class="aleft">
<div id="a<?php print $item['siren'];?>" class="action">
<p><?php print ucfirst($item['source']);?></p>
<div class="action">
<p><?=ucfirst($item['source'])?></p>
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $item['source'];?>&ref=<?php print $item['ref'];?>&email=<?php print $item['email'];?>" title="Editer la surveillance <?php print $item['source'];?>"><img src="./img/interface/editer.png"/></a>
<a href="./?page=surveillance&action=supprimer&siret=<?$item['siren'].$item['nic']?>&ref=<?php print $item['ref']; ?>&source=<?php print $item['source'];?>&email=<?php print $item['email']; ?>" title="Supprimer la surveillance <?php print $item['source'].' '.$item['email'];?>"><img src="./img/interface/supprimer.png"/></a>
</div>
@ -448,6 +445,6 @@ foreach($listTrier as $item){
}
}//Fin vue==source
?>
<tbody>
</tbody>
</table>
</div>