version 1.0 correccion modulos web

git-svn-id: https://opengnsys.es/svn/branches/version1.0@1501 a21b9725-9963-47de-94b9-378ad31fedc9

2 files changed, 125 insertions, 22 deletions

diff --git a/admin/WebConsole/comandos/includes/asistentes/AyudanteFormularios.php b/admin/WebConsole/comandos/includes/asistentes/AyudanteFormularios.php
index 3a311885..43081c08 100644
--- a/admin/WebConsole/comandos/includes/asistentes/AyudanteFormularios.php
+++ b/admin/WebConsole/comandos/includes/asistentes/AyudanteFormularios.php
@@ -97,6 +97,11 @@ function htmlOPTION_equipos($cmd,$idambito)
 	return($SelectHtml);	
 }
 
+
+
+
+
+
 function htmlOPTION_images($cmd)
 {
 	$SelectHtml="";
@@ -178,6 +183,73 @@ function htmlOPTION_typepartnotcache($cmd)
 }
 
 
+function htmlForm_typepart($cmd,$numpar)
+{
+	$SelectHtml="";
+	$cmd->texto='SELECT DISTINCT tipopar FROM tipospar JOIN ordenadores_particiones ON ordenadores_particiones.codpar = tipospar.codpar WHERE numpar = ' .$numpar;
+	$rs=new Recordset; 
+	$rs->Comando=&$cmd; 
+
+	if ($rs->Abrir()){
+		$rs->Primero(); 
+		while (!$rs->EOF){
+			$SelectHtml.='<OPTION value="'.$rs->campos["tipopar"] . '" ';
+			$SelectHtml.='>';
+			$SelectHtml.= $rs->campos["tipopar"] .'</OPTION>';
+			$rs->Siguiente();
+		}
+		$rs->Cerrar();
+	}
+	return($SelectHtml);	
+}
+
+
+
+
+
+
+
+function htmlForm_typepartnotcacheEngine10()
+{
+$SelectHtml="";
+$SelectHtml.='<OPTION value="FAT12"> FAT12 </OPTION>';
+$SelectHtml.='<OPTION value="FAT16"> FAT16 </OPTION>';
+$SelectHtml.='<OPTION value="FAT32"> FAT32 </OPTION>';
+$SelectHtml.='<OPTION value="NTFS"> NTFS </OPTION>';
+$SelectHtml.='<OPTION value="EXT2"> EXT2 </OPTION>';
+$SelectHtml.='<OPTION value="EXT3"> EXT3 </OPTION>';
+$SelectHtml.='<OPTION value="EXT4"> EXT4 </OPTION>';
+$SelectHtml.='<OPTION value="LINUX-SWAP"> LINUX-SWAP </OPTION>';
+$SelectHtml.='<OPTION value="REISERFS"> REISERFS </OPTION>';
+$SelectHtml.='<OPTION value="REISER4"> RESISER4 </OPTION>';
+$SelectHtml.='<OPTION value="XFS"> XFS </OPTION>';
+$SelectHtml.='<OPTION value="JFS"> JFS </OPTION>';
+$SelectHtml.='<OPTION value="LINUX-RAID"> LINUX-RAID </OPTION>';
+$SelectHtml.='<OPTION value="LINUX-LVM"> LINUX-LVM </OPTION>';
+return($SelectHtml);
+}
+
+
+function htmlForm_sizepart($cmd,$numpar)
+{
+	$SelectHtml="";
+	$cmd->texto='SELECT DISTINCT tamano FROM ordenadores_particiones WHERE numpar = ' .$numpar . ' AND NOT tamano = 0';
+	$rs=new Recordset; 
+	$rs->Comando=&$cmd; 
+
+	if ($rs->Abrir()){
+		$rs->Primero(); 
+		while (!$rs->EOF){
+			$SelectHtml.='<OPTION value="'.$rs->campos["tamano"] . '" ';
+			$SelectHtml.='>';
+			$SelectHtml.= $rs->campos["tamano"] .'</OPTION>';
+			$rs->Siguiente();
+		}
+		$rs->Cerrar();
+	}
+	return($SelectHtml);	
+}
+
 function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc)
 {
 	global $tbKeys; // Tabla contenedora de claves de configuración
diff --git a/admin/WebConsole/comandos/includes/asistentes/formParticionado.php b/admin/WebConsole/comandos/includes/asistentes/formParticionado.php
index aa669633..ba23012b 100644
--- a/admin/WebConsole/comandos/includes/asistentes/formParticionado.php
+++ b/admin/WebConsole/comandos/includes/asistentes/formParticionado.php
@@ -3,38 +3,69 @@
 <TR>
 <TD >  Particion </TD>
 <TD > Tipo </TD>
-<TD > Tamaño </TD>
+<TD > Tamano </TD>
 </TR>
 
 <TR>
-<TD > 1 </TD>
-<TD>	<select name="part1" id="part1" style="WIDTH:220" >
-				<option value="">-- particon--</option>
-				<?php echo ''. htmlOPTION_typepartnotcache($cmd)  .''; ?>
+<TD > <input type="checkbox" name="check1" value="check1" onclick="if (this.form.check1.checked) { this.form.part1.disabled=false; this.form.size1.disabled=false } else { this.form.part1.disabled=true; this.form.size1.disabled=true; this.form.part1custom.disabled=true; this.form.size1custom.disabled=true }" /> <br> Particion 1 </TD>
+<TD>
+<select name="part1" id="part1" style="WIDTH:220" disabled="true" onclick="if (this.form.part1.options[this.form.part1.selectedIndex].value == 'CUSTOM') { this.form.part1custom.disabled=false; this.form.part1.disabled=true }" >
+	<?php echo ''. htmlForm_typepart($cmd,1)  .''; ?> 
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br>
+<select name="part1custom" id="part1custom" style="WIDTH:220" disabled="true" >
+		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></TD>
-<TD ><INPUT type="text" style="width:100" name="size1" value="0"></TD>
+
+<TD><select name="size1" id="size1" style="WIDTH:220" disabled="true" onclick="if (this.form.size1.options[this.form.size1.selectedIndex].value == 'CUSTOM') { this.form.size1custom.disabled=false; this.form.size1.disabled=true }" >
+		<?php echo ''. htmlForm_sizepart($cmd,1)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br >
+<INPUT type="text" style="width:100" name="size1custom" value="1" disabled="true"></TD>
 </TR>
 
-<TR>
-<TD > 2 </TD>
-<TD>	<select name="part2" id="part2" style="WIDTH:220" >
-				<option value="">-- particon--</option>
-				<?php echo ''. htmlOPTION_typepartnotcache($cmd)  .''; ?>
+<TD > <input type="checkbox" name="check2" value="check2" onclick="if (this.form.check2.checked) { this.form.part2.disabled=false; this.form.size2.disabled=false } else { this.form.part2.disabled=true; this.form.size2.disabled=true; this.form.part2custom.disabled=true; this.form.size2custom.disabled=true }" /> <br> Particion 2 </TD>
+<TD><select name="part2" id="part2" style="WIDTH:220" disabled="true" onclick="if (this.form.part2.options[this.form.part2.selectedIndex].value == 'CUSTOM') { this.form.part2custom.disabled=false; this.form.part2.disabled=true }" >
+		<?php echo ''. htmlForm_typepart($cmd,2)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br>
+<select name="part2custom" id="part2custom" style="WIDTH:220" disabled="true" >
+		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></TD>
-<TD ><INPUT type="text" style="width:100" name="size" value="0"></TD>
+
+<TD><select name="size2" id="size2" style="WIDTH:220" disabled="true" onclick="if (this.form.size2.options[this.form.size2.selectedIndex].value == 'CUSTOM') { this.form.size2custom.disabled=false; this.form.size2.disabled=true }" >
+		<?php echo ''. htmlForm_sizepart($cmd,2)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br >
+<INPUT type="text" style="width:100" name="size2custom" value="1" disabled="true"></TD>
 </TR>
 
-<TR>
-<TD > 3 </TD>
-<TD>	<select name="part3" id="part3" style="WIDTH:220" >
-				<option value="">-- particon--</option>
-				<?php echo ''. htmlOPTION_typepartnotcache($cmd)  .''; ?>
+
+<TD > <input type="checkbox" name="check3" value="check3" onclick="if (this.form.check3.checked) { this.form.part3.disabled=false; this.form.size3.disabled=false } else { this.form.part3.disabled=true; this.form.size3.disabled=true; this.form.part3custom.disabled=true; this.form.size3custom.disabled=true }" /> <br> Particion 3 </TD>
+<TD><select name="part3" id="part3" style="WIDTH:220" disabled="true" onclick="if (this.form.part3.options[this.form.part3.selectedIndex].value == 'CUSTOM') { this.form.part3custom.disabled=false; this.form.part3.disabled=true }" >
+		<?php echo ''. htmlForm_typepart($cmd,3)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br>
+<select name="part3custom" id="part3custom" style="WIDTH:220" disabled="true" >
+		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></TD>
-<TD ><INPUT type="text" style="width:100" name="size3" value="0"></TD>
-<TR>
+
+<TD><select name="size3" id="size3" style="WIDTH:220" disabled="true" onclick="if (this.form.size3.options[this.form.size3.selectedIndex].value == 'CUSTOM') { this.form.size3custom.disabled=false; this.form.size3.disabled=true }" >
+		<?php echo ''. htmlForm_sizepart($cmd,3)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>
+</select>
+<br >
+<INPUT type="text" style="width:100" name="size3custom" value="1" disabled="true"></TD>
+</TR>
 
 <TR>
-<TD > 4 </TD>
-<TD> <INPUT type="label" readonly size="8" name="part4" value="CACHE"></TD>
-<TD ><INPUT type="text" style="width:100" name="size4" value="0"></TD>
+
+<TD > <input type="checkbox" name="check4" value="check4" onclick="if (this.form.check4.checked) { this.form.part4.disabled=false; this.form.size4.disabled=false } else { this.form.part4.disabled=true; this.form.size4.disabled=true }" /> <br> Particion 4 </TD>
+<TD> <INPUT type="label" readonly size="8" name="part4" disabled="true" value="CACHE"></TD>
+<TD ><INPUT type="text" style="width:100" name="size4" disabled="true" value="0"></TD>
 </TR>
\ No newline at end of file