version1.0 asistente particionado: ticket:363 #363 tamanio cache modificable

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

3 files changed, 27 insertions, 12 deletions

diff --git a/admin/WebConsole/asistentes/AsistenteParticionado.php b/admin/WebConsole/asistentes/AsistenteParticionado.php
index b48e0cf5..de1b5f72 100644
--- a/admin/WebConsole/asistentes/AsistenteParticionado.php
+++ b/admin/WebConsole/asistentes/AsistenteParticionado.php
@@ -20,9 +20,7 @@ include_once("../includes/comunes.php");
 include_once("../includes/CreaComando.php");
 include_once("../includes/HTMLSELECT.php");
 include_once("../idiomas/php/".$idioma."/comandos/ejecutarscripts_".$idioma.".php");
-
-
-
+include_once("../idiomas/php/".$idioma."/configuraciones_".$idioma.".php");
 include_once("../includes/HTMLCTESELECT.php");
 include_once("../includes/TomaDato.php");
 include_once("../includes/ConfiguracionesParticiones.php");
@@ -86,9 +84,16 @@ switch($ambito){
 			$textambito=$TbMsg[4];
 			break;
 	}
-	echo '<p align=center><span class=cabeceras>'.$descricomando.'&nbsp;</span><br>';
-	echo '<IMG src="'.$urlimg.'">&nbsp;&nbsp;<span align=center class=subcabeceras>
-				<U>'.$TbMsg[6].': '.$textambito.','.$nombreambito.'</U></span>&nbsp;&nbsp;</span></p>';
+	
+	//echo '<p align=center><span class=cabeceras>'.$descricomando.'&nbsp;</span><br>';
+	//echo '<IMG src="'.$urlimg.'">&nbsp;&nbsp;<span align=center class=subcabeceras>
+	//			<U>'.$TbMsg[6].': '.$textambito.','.$nombreambito.'</U></span>&nbsp;&nbsp;</span></p>';
+
+	if(!$swp){
+		echo '<p align=center><span class=cabeceras>'.$descricomando.'&nbsp;</span><br>';
+		echo '<IMG src="'.$urlimg.'">&nbsp;&nbsp;<span align=center class=subcabeceras><U>'.$TbMsg[1].'
+				: '.$textambito.'</U></span>&nbsp;&nbsp;</span></p>';
+	}
 
 	$sws=$fk_sysFi | $fk_nombreSO | $fk_tamano | $fk_imagen | $fk_perfil;
 	pintaConfiguraciones($cmd,$idambito,$ambito,7,$sws,false);	
diff --git a/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php b/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
index dba79047..f2f08bac 100644
--- a/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
+++ b/admin/WebConsole/asistentes/includes/asistentes/formParticionado.php
@@ -3,7 +3,7 @@
 <TR>
 <TD >  Particion </TD>
 <TD > Tipo </TD>
-<TD > Tamano </TD>
+<TD > Tamano KB </TD>
 </TR>
 
 <TR>
@@ -67,9 +67,11 @@
 
 <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><select name="size4" id="size4" style="WIDTH:220" 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; this.form.size4.disabled=true }" > 
 		<option value="0"> Sin modificar tamanio </option>
-		<?php echo ''. htmlForm_sizepart($cmd,4)  .''; ?>		
+		<?php echo ''. htmlForm_sizepart($cmd,4)  .''; ?>
+		<option value="CUSTOM"> Personalizar </option>		
 </select>
-
+<br >
+<INPUT type="text" style="width:100" name="size4custom" value="0" disabled="true"></TD>
 </TR>
\ No newline at end of file
diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js
index 2ac48d9c..5c5f9c40 100644
--- a/admin/WebConsole/asistentes/jscripts/asistentes.js
+++ b/admin/WebConsole/asistentes/jscripts/asistentes.js
@@ -79,8 +79,16 @@ precache="ogUnmountCache \n ogUnmountAll 1 \n sizecache=`ogGetPartitionSize 1 4`
 }
 else
 {
-precache="ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1  \n ogUpdatePartitionTable 1 \n initCache "  + form.size4.value + " ";
-//alert(precache);
+	if (form.size4.value == "CUSTOM")  
+	{ 
+		cachesize = form.size4custom.value; 
+	}
+	else 
+	{
+		cachesize = form.size4.value;
+	} 
+	precache="ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1  \n ogUpdatePartitionTable 1 \n initCache "  + cachesize + " ";
+	//alert(precache);
 }