[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/src/srvprxy config_drm.html.wasm,1.8,1.9
From:       yijil () helixcommunity ! org
Date:       2012-09-27 8:24:21
[Download RAW message or body]

Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4464/src/srvprxy

Modified Files:
	config_drm.html.wasm 
Log Message:
sync with SERVER_15_0_RN


Index: config_drm.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_drm.html.wasm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config_drm.html.wasm	23 Aug 2012 11:32:52 -0000	1.8
+++ config_drm.html.wasm	27 Sep 2012 08:24:08 -0000	1.9
@@ -173,7 +173,7 @@
 {
     if( getCtrlValue( theForm.HttpPassword ) != getCtrlValue( theForm.HttpPassword2 \
) )  {
-	return rejectInput( theForm.HttpPassword, "password not match" );
+	return rejectInput( theForm.HttpPassword, "Passwords do not match" );
     }
 
     if( propList.subList( 'HLS_DRM' ).isDirty() ||
@@ -260,12 +260,11 @@
 <@= tabHeader @>
 
 <@= formTableTag @>
-	<@= formElemText( "Verimatrix Server Address", name => "KeyServerAddr", class => \
                "longInput", maxlength=>255 ); @>
-    <@= formElemText( "Verimatrix Server Port", name => "KeyServerPort", class => \
                "input"); @>
-	<@= formElemText( "Verimatrix Server Request Timeout", name => \
                "KeyServerRequestTimeout", class => "input"); @>
-	<@= formElemPassword( "HTTP API Password", name => "HttpPassword", class => \
                "input", RESTART_FLAG => 1); @>
-	<@= formElemSelectYesNo( "Enable SSL for Verimatrix Server", name => \
                "EnableKeyServerSSL",  class => "input", maxlength=>16 ); @>
-	<@= formElemSelectYesNo( "Enable random key when Verimatrix Server connection \
failed", name => "EnableRandomKeyWhenFail",  class => "input", maxlength=>16 ); @> +  \
<@= formElemText( "Verimatrix Server Address", name => "KeyServerAddr", class => \
"longInput", maxlength=>255 ); @> +        <@= formElemText( "Verimatrix Listen \
Port", name => "KeyServerPort", class => "input"); @> +        <@= formElemText( "Key \
Request Timeout", name => "KeyServerRequestTimeout", class => "input"); @> +        \
<@= formElemPassword( "HTTP API Password", name => "HttpPassword", class => "input", \
RESTART_FLAG => 1); @> +        <@= formElemSelectYesNo( "Enable random Key", name => \
"EnableRandomKeyWhenFail",  class => "input", maxlength=>16 ); @>  
 <@
     FORM_STYLE( "WRAP");
@@ -285,12 +284,12 @@
 
     <@= formTableCellRight @>
         <@= formElemText( "Source Description" , name => "theEdit", class => \
                "longInput", maxlength=>255 ); @>
-		<BR>
-		<@= formElem( "Live Resouce ID Range", 
-		qq{<FONT color="red">*</FONT><input type="text" class="input" name="LRange0" \
size="15" >&nbsp;to&nbsp;<input type="text" class="input" name="LRange1" size="15" >} \
                ); @>
-		<BR>
-		<@= formElem( "Ondemand Resouce ID Range", 
-		qq{<FONT color="red">*</FONT><input type="text" class="input" name="VRange0" \
size="15" >&nbsp;to&nbsp;<input type="text" class="input" name="VRange1" size="15" >} \
); @> +		<BR>Live Resource ID Range<FONT color="red">*</FONT>
+		<@= formElem( "",  
+		qq{<input type="text" class="input" name="LRange0" size="15" >&nbsp;to&nbsp;<input \
type="text" class="input" name="LRange1" size="15" >} ); @> +		<BR>On-demand Resource \
ID Range<FONT color="red">*</FONT> +		<@= formElem( "", 
+		qq{<input type="text" class="input" name="VRange0" size="15" >&nbsp;to&nbsp;<input \
type="text" class="input" name="VRange1" size="15" >} ); @>  <BR>
     </TD>
 </TR>


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]