Versión 1.0: modificado formulario del asistente de particionado para recuperar valores por defecto (cerrar #364).

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

2 files changed, 28 insertions, 22 deletions

diff --git a/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php b/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
index cbeb642b..48476243 100644
--- a/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
+++ b/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
@@ -7,9 +7,9 @@
 </TR>
 
 <TR>
-<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> Partici&oacute;n 1 </TD>
+<TD > <input type="checkbox" name="check1" value="check1" onclick="if (this.form.check1.checked) { this.form.part1.disabled=false; this.form.size1.disabled=false; if (this.form.part1.options[this.form.part1.selectedIndex].value == 'CUSTOM') { this.form.part1custom.disabled=false } if (this.form.size1.options[this.form.size1.selectedIndex].value == 'CUSTOM') { this.form.size1custom.disabled=false } } else { this.form.part1.disabled=true; this.form.size1.disabled=true; this.form.part1custom.disabled=true; this.form.size1custom.disabled=true }" /> <br> Partici&oacute;n 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 }" >
+<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 } else { this.form.part1custom.disabled=true }" >
 	<?php echo ''. htmlForm_typepart($cmd,1)  .''; ?> 
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -18,7 +18,7 @@
 		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></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 }" >
+<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 } else { this.form.size1custom.disabled=true }" >
 		<?php echo ''. htmlForm_sizepart($cmd,1)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -26,8 +26,9 @@
 <INPUT type="text" style="width:100" name="size1custom" value="0" disabled="true"></TD>
 </TR>
 
-<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> Partici&oacute;n 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 }" >
+<TR>
+<TD > <input type="checkbox" name="check2" value="check2" onclick="if (this.form.check2.checked) { this.form.part2.disabled=false; this.form.size2.disabled=false; if (this.form.part2.options[this.form.part2.selectedIndex].value == 'CUSTOM') { this.form.part2custom.disabled=false } if (this.form.size2.options[this.form.size2.selectedIndex].value == 'CUSTOM') { this.form.size2custom.disabled=false } } else { this.form.part2.disabled=true; this.form.size2.disabled=true; this.form.part2custom.disabled=true; this.form.size2custom.disabled=true }" /> <br> Partici&oacute;n 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 } else { this.form.part2custom.disabled=true }" >
 		<?php echo ''. htmlForm_typepart($cmd,2)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -36,7 +37,7 @@
 		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></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 }" >
+<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 } else { this.form.size2custom.disabled=true }" >
 		<?php echo ''. htmlForm_sizepart($cmd,2)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -44,9 +45,9 @@
 <INPUT type="text" style="width:100" name="size2custom" value="0" disabled="true"></TD>
 </TR>
 
-
-<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> Partici&oacute;n 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 }" >
+<TR>
+<TD > <input type="checkbox" name="check3" value="check3" onclick="if (this.form.check3.checked) { this.form.part3.disabled=false; this.form.size3.disabled=false; if (this.form.part3.options[this.form.part3.selectedIndex].value == 'CUSTOM') { this.form.part3custom.disabled=false } if (this.form.size3.options[this.form.size3.selectedIndex].value == 'CUSTOM') { this.form.size3custom.disabled=false } } else { this.form.part3.disabled=true; this.form.size3.disabled=true; this.form.part3custom.disabled=true; this.form.size3custom.disabled=true }" /> <br> Partici&oacute;n 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 } else { this.form.part3custom.disabled=true }" >
 		<?php echo ''. htmlForm_typepart($cmd,3)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -55,7 +56,7 @@
 		<?php echo ''. htmlForm_typepartnotcacheEngine10()  .''; ?>
 </select></TD>
 
-<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 }" >
+<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 } else { this.form.size3custom.disabled=true }" >
 		<?php echo ''. htmlForm_sizepart($cmd,3)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>
 </select>
@@ -64,10 +65,9 @@
 </TR>
 
 <TR>
-
-<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> Partici&oacute;n 4 </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; if (this.form.size4.options[this.form.size4.selectedIndex].value == 'CUSTOM') { this.form.size4custom.disabled=false } } else { this.form.part4.disabled=true; this.form.size4.disabled=true; this.form.size4.options[0].selected=true; }" /> <br> Partici&oacute;n 4 </TD>
 <TD> <INPUT type="label" readonly size="8" name="part4" disabled="true" value="CACHE"></TD>
-<TD><select name="size4" id="size4" style="WIDTH:220" disabled="true" onclick="if (this.form.size4.options[this.form.size4.selectedIndex].value == 'CUSTOM') { this.form.size4custom.disabled=false; this.form.size4.disabled=true }" > 
+<TD><select name="size4" id="size4" style="WIDTH:220" disabled="true" onclick="if (this.form.size4.options[this.form.size4.selectedIndex].value == 'CUSTOM') { this.form.size4custom.disabled=false } else { this.form.size4custom.disabled=true }" > 
 		<option value="0"> Sin modificar tama&ntilde;o </option>
 		<?php echo ''. htmlForm_sizepart($cmd,4)  .''; ?>
 		<option value="CUSTOM"> Personalizar </option>		
diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt
index 1f539bfc..6f0ac21a 100644
--- a/doc/CHANGELOG.es.txt
+++ b/doc/CHANGELOG.es.txt
@@ -23,9 +23,9 @@ Tickets resueltos en módulo OpenGnSys Client:
 #243	Browser incluye terminal con letra monospace y barra de estado en UTF-8 (mejora)
 #303	Integracion proceso arranque cliente versión 1.0
 #304 	Integracion interface adm versión 1.0
-#314 	smb punto acceso 2nd FileSystem del cliente [tftpboot] [ogboot]
+#314 	SMB punto acceso 2nd FileSystem del cliente [tftpboot] [ogboot]
 #345	Importar "runtest" para la versión 1.0 (mejora)
-#334	OgClient - admin problemas al escribir en el repo
+#334	OgClient en modo admin: problemas al escribir en el repo
 #336	Regenerar el cliente ogclient-1.0-lucid-32bit.tar.gz
 #360	Importar herramientas de generación del cliente desde la rama ogClient (mejora)
 
@@ -34,22 +34,26 @@ Tickets resueltos en módulo OpenGnSys Server:
 
 Tickets resueltos en módulo OpenGnSys Repository Server:
 #188	Al restaurar por torrent el BitFile no se crea siempre
-#300	integracion bin del repo
+#300	Integración binarios del repo
 
 Tickets resueltos en módulo OpenGnSys Web Admin Console:
 #126	Integración de consola Web con bittorent (mejora)
 #138	Configurar parámetros de red en cliente
 #185	Aproximación a la gestión log de los clientes (mejora)
 #248	La consola web no muestra datos del repositorio hasta que no se asigna
-#258	Consola Web: Error al eliminar un perfil de software
-#266	Consola web: Información unidades de la caché
-#268	Consola Web: error texto de formularios
-#301	Integracion modulos web versión 1.0
-#302	Integracion base de datos version 1.0
+#258	Error al eliminar un perfil de software
+#266	Información unidades en tamaño de la caché
+#268	Erratas en texto de formularios
+#301	Integración modulos web versión 1.0
+#302	Integración base de datos version 1.0
+#306	Asistente Clonacion Particiones Remotas: no genera codigo
 #310	Instalar: no genera las propiedades del repositorio por defecto en la consola (duplicado de #248)
 #338	Validación de formularios de la consola web
 #339	Añadir opción de apagado en cliente sin menú asociado (mejora)
-#349	Boton de confirmacion en gestor de arranque
+#349	Botón de confirmación en gestor de arranque
+#359	Ocultar los comandos inacabados en la consola web
+#363	Asistente particionado no permite valores personalizados para la caché
+#364	Asistente particionado no recupera valores iniciales si se pulsa en personalizar
 
 Tickets resueltos en módulo OpenGnSys Installer:
 #299	Instalador para la versión 1.0
@@ -59,6 +63,8 @@ Tickets resueltos en módulo OpenGnSys Installer:
 #335	Error en opengnsys_update.sh al descomprimir cliente
 #361	Actualizador debe aplicar cambios en la estructura de base de datos
 
+Tickets genéricos resueltos:
+
 
 Lista de cambios incluidos en OpenGnSys 0.10
 --------------------------------------------