Index: trunk/client/modules/Elezioni/gruppo.php
===================================================================
--- trunk/client/modules/Elezioni/gruppo.php	(revision 103)
+++ trunk/client/modules/Elezioni/gruppo.php	(revision 104)
@@ -179,11 +179,17 @@
 */
 			$visvot='';
+
+			if (!$csv) echo "<div><h5>$pagina</h5></div>";
+			if (!$csv) echo "<div style=\"text-align:left; margin-left:20px;\">";
+
 			if(strstr( $op,'candidato')){
 //			$numliste=mysql_num_rows($res_lis);
 				$visvot="cand";
 				if (!$csv){
+					
+
 					$res_lis = mysql_query("SELECT id_lista, descrizione,num_lista from ".$prefix."_ele_lista where id_cons=$id_cons $condcirc order by num_lista",$dbi);
 					//elenco delle liste per la scelta
-					echo "<p>Scegli la lista: 
+					echo "<p>"._SCEGLI_LISTA.": 
 					<select name=\"id_lista\" class=\"modulo\" onChange=\"top.location.href=this.form.pag.value+this.form.id_lista.options[this.form.id_lista.selectedIndex].value;return false\">";
 					while(list($id_rif,$descrizione,$num_lis) = mysql_fetch_row($res_lis)) {
@@ -279,7 +285,6 @@
 			if (!(0<$offset and $offset<=$num_cand)) $offset=$num_cand;
 			if (!$csv) {		
-				echo "<br /><table>
-				  <tr><td><h5>$pagina</h5></td></tr>";
-				echo "<tr><td>"._DA.":&nbsp;  <select name=\"min\" class=\"modulo\">";
+				if(strstr( $op,'lista')){$scelta=_SCEGLI_LISTA;}else{$scelta=_SCEGLI_CANDI;}
+				echo "<p>$scelta "._DA.":&nbsp;  <select name=\"min\" class=\"modulo\">";
 				while(list($id_rif,$descrizione,$num_lis) = mysql_fetch_row($res_cand)) {
 					if (!$min) $min=$num_lis;
@@ -290,6 +295,6 @@
 					
 				}
-				echo "</select></td></tr>";
-				echo "<tr><td>&nbsp;&nbsp;"._A.":&nbsp; <select name=\"offset\" class=\"modulo\">";
+				echo "</select>";
+				echo "&nbsp;&nbsp;"._A.":&nbsp; <select name=\"offset\" class=\"modulo\">";
 				mysql_data_seek($res_cand,0);
 				while(list($id_rif,$descrizione,$num_lis) = mysql_fetch_row($res_cand)) {
@@ -301,40 +306,46 @@
 					
 				}
-				echo "</select></td></tr></table>";
-				echo "<table><tr><td>";
+				echo "</select></p>";
+				//echo "<div style=\"text-align:left; margin-left:20px;\">";
+				if(!$circo){
+				echo "<p>"._SCEGLI." $tipo1 n. <input  name=\"minsez\" value=\"$minsez\" size=\"4\" ></input>";
+				echo _A." n. <input  name=\"offsetsez\" value=\"$offsetsez\" size=\"4\" ></input> (max. $num_sez)";
+				}
+				# pagine
+				$diff=($offsetsez-$minsez);
+				if ($minsez>1){
+					$minsez_p= ($minsez-$diff)>1 ? $minsez-$diff-1:1;
+					 
+					$offsetsez_p=$offsetsez-$diff-1;
+								echo "<div style=\"float: right; width:200px;margin-left:10px;margin-right:400px;font-size:12px \"><a href=\"modules.php?name=Elezioni&amp;file=index&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;op=$op&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez_p&amp;offsetsez=$offsetsez_p&amp;perc=$perc&amp;id_lista=$id_lista\"> <- $tipo2 Precedenti</a></div>";
+				}else{echo "";}
+
+				if ($offsetsez<$num_sez){
+					$minsez_s=$minsez+$diff+1;
+					$offsetsez_s= ($offsetsez+$diff)>$num_sez ? $num_sez: $offsetsez+$diff+1;
+
+								echo "<div style=\"float: left; width:200px; margin-left:10px;\"><a href=\"modules.php?name=Elezioni&amp;file=index&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez_s&amp;offsetsez=$offsetsez_s&amp;perc=$perc&amp;id_lista=$id_lista\"> $tipo2 Successive -></a></div>";
+				}else{echo "";}	
+
+
+
+
+
 				if(!$circo)
-				echo "$tipo1 n. <input  name=\"minsez\" value=\"$minsez\" size=\"4\" ></input>";
-				echo "</td>";
-				echo "<td>";
-				if(!$circo)
-				echo _A." n. <input  name=\"offsetsez\" value=\"$offsetsez\" size=\"4\" ></input> (max. $num_sez)";
-				echo "</td>
-				<td align=\"right\">"._MOSTRA." $tipo2 <br/>"._PERCOL."<input type=\"radio\" name=\"orvert\" $righe value=\"0\"></input><br/>"._PERRIGHE." <input
+				
+				echo "<div style=\"margin-left:10px;\"><br/>"._MOSTRA." $tipo2 "._PERCOL."<input type=\"radio\" name=\"orvert\" $righe value=\"0\"></input>"._PERRIGHE." <input
 				type=\"radio\" name=\"orvert\" $colonne value=\"1\"></input>";
 				echo "<input type=\"hidden\" name=\"name\" value=\"Elezioni\"></input>
-				</td></tr>";
-$diff=($offsetsez-$minsez);
-if ($minsez>1){
-	$minsez_p= ($minsez-$diff)>1 ? $minsez-$diff-1:1;
-	 
-	$offsetsez_p=$offsetsez-$diff-1;
-				echo "<tr><td valign=\"middle\"><div align=\"right\"><a href=\"modules.php?name=Elezioni&amp;file=index&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;op=$op&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez_p&amp;offsetsez=$offsetsez_p&amp;perc=$perc&amp;id_lista=$id_lista\"> <- Precedenti</a></div></td>";
-}else{echo "<tr><td></td>";}
-if ($offsetsez<$num_sez){
-        $minsez_s=$minsez+$diff+1;
-        $offsetsez_s= ($offsetsez+$diff)>$num_sez ? $num_sez: $offsetsez+$diff+1;
-
-				echo "<td><div><a href=\"modules.php?name=Elezioni&amp;file=index&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez_s&amp;offsetsez=$offsetsez_s&amp;perc=$perc&amp;id_lista=$id_lista\"> Successive -></a></div></td><td></td></tr>";
-}else{echo "<td></td><td></td></tr>";}	
-
-				
-				
-				echo "<tr>";
+				</div>";
+
+				
+				
+				echo "<p>";
 				if (!strstr( $op,'candidato')) {
-					echo "<td>"._VIS_PERC.": <input type=\"checkbox\" name=\"perc\" value=\"true\"";
+					echo ""._VIS_PERC.": <input type=\"checkbox\" name=\"perc\" value=\"true\"";
 					if($perc=='true') echo " checked=\"true\"";
-					echo "></input></td>";
-				}
-				echo "<td>";
+					echo "></input><br/>";
+				}
+				echo "";
 			if($circo) 
 				echo "<input type=\"hidden\" name=\"id_circ\" value=\"$id_circ\"></input>";	
@@ -345,5 +356,5 @@
 				echo "<input type=\"hidden\" name=\"pag2\" value=\"modules.php?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=\"></input>";	
 
-				 echo "<input type=\"submit\" name=\"update\" value=\""._OK."\"></input>"; 
+				 echo " <input type=\"submit\" name=\"update\" value=\""._RICARICA."\"></input></p></div>"; 
 
 
@@ -385,29 +396,33 @@
 			      
 				$datipdf="<b>"._COMUNE." $descr_comune</b> - "._RISULTATI.": $descr_cons<br/><b>$pagina</b><br/><br/> $list1 $list2 $list3 ";
+			
+				
+				
+				
+
+
+				
+				  # verificare la stampa sulle circoscrizioni
+				echo "<div style=\"text-align:right;width:900px;margin-left:10px;margin-right:20px;font-size:12px \">"._ESPORTA."<br />";
+				 if($circo) echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;id_circ=$id_circ&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/printer.gif\" alt=\"Stampa\" /></a>";
+				else{ 
+				  echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/printer.gif\" alt=\"Stampa\" /></a>";
+				  echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;xls=1&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/csv.gif\" alt=\"Export Csv\" /></a>";
+				  echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;pdf=1&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/pdf.gif\" alt=\"Export Pdf\" /></a>";
+				}
+				echo "</div></form>";
+				/*
 				if (!$circo)
 				echo "dalla $tipo3 n. <b>$minsez</b> alla $tipo3 n. <b>$offsetsez</b> di <b>$num_sez</b> $tipo2<br/><br/>";
 				else echo "<br/><br/>";
 				
-				
-
-
-				
-				  # verificare la stampa sulle circoscrizioni
-				 if($circo) echo "</td><td><a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;id_circ=$id_circ&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/printer.gif\" alt=\"Stampa\" /></a>";
-				else{ 
-				  echo "</td><td><a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/printer.gif\" alt=\"Stampa\" /></a>";
-				  echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;xls=1&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/csv.gif\" alt=\"Export Csv\" /></a>";
-				  echo "<a href=\"".$_SERVER['PHP_SELF']."?name=Elezioni&amp;op=$op&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune&amp;csv=1&amp;orvert=$orvert&amp;min=$min&amp;offset=$offset&amp;minsez=$minsez&amp;offsetsez=$offsetsez&amp;perc=$perc&amp;id_lista=$id_lista&amp;pdf=1&amp;datipdf=$datipdf\" ><img class=\"image\"  src=\"modules/Elezioni/images/pdf.gif\" alt=\"Export Pdf\" /></a>";
-				}
-				echo "</td></tr></table></div></form>";
-				
 				if (strstr( $op,'candidato')) echo $list2;	
-				
+				*/
 				
 			}
 			if (!$csv){
-				//echo "<table border=\"0\" width=\"100%\"><tr><td align=\"center\"><h5> Sezioni scrutinate";
-				//if ($tipo_cons!=4) echo ": $tot_scr su $tot_sez";
-				//echo "</h5></td></tr></table>";
+				echo "<div style=\"text-align:right;width:900px;margin-left:10px;margin-right:2px;font-size:12px \"><h5> Sezioni scrutinate";
+				if ($tipo_cons!=4) echo ": $tot_scr su $tot_sez &nbsp;&nbsp;&nbsp;  ";
+				echo "</h5>&nbsp; </div>";
 			}
 			$y=1;
@@ -448,5 +463,5 @@
 
 ###################			<span class=\"red\"><i>".$temp3[$key]." %</i></span>		
-					$ar[$z][0]=$res[0]; if($grpercscru) {$ar[$z][0].="<br><span class=\"red\"><i>$grpercscru%</i></span>";if(!strstr($ar[0][0],'scrutinio')) $ar[0][0].="<br><span class=\"red\"><i>% scrutinio</i></span>"; }
+					$ar[$z][0]=$res[0]; if($grpercscru) {$ar[$z][0].="<br /><span class=\"red\"><i>$grpercscru%</i></span>";if(!strstr($ar[0][0],'scrutinio')) $ar[0][0].="<br /><span class=\"red\"><i>% scrutinio</i></span>"; }
 					$pos[$z]=$res[0];
 					#$valar[$z]=array();
