[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] admin/web/src/srvprxy config_broad_redun.html.wasm, 1.4,
From: yijil () helixcommunity ! org
Date: 2012-10-10 8:49:13
[Download RAW message or body]
Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16324/src/srvprxy
Modified Files:
config_broad_redun.html.wasm
config_broad_rtmp_ingress.html.wasm config_sec_cert.html.wasm
config_viewsrc.html.wasm samples.html.wasm
Log Message:
Committed to : HEAD, SERVER_15_0_RN
Reviewed by: Xiaocheng
Synopsis:
===============
Bug 270749: Samples page states "RealVideo 10 Progressive Download" when it's not Bug \
270760: HLS samples text incorrect Bug 270766: [Admin UI]There are some text problems \
on Server UI and Proxy UI
Branch: SERVER_15_0_RN, HEAD
Suggested Reviewers: Anyone
Description:
===============
1) Bug 270749: Samples page states "RealVideo 10 Progressive Download" when it's not
On the Helix Server v15 samples page it shows "RealVideo10 (HTTP Progressive
download) - RealPlayer" - The content is NOT progressive download, the content is \
RTSP streamed and so this wording needs to be changed for accuracy.
2) Bug 270760: HLS samples text incorrect
The text in the Helix Admin samples page (admin/samples.html) states that for HLS
content: "You must enable segmentation before this link will work." while this isn't \
actually the case anymore.
On a default server install you can click the link and the content will play as the \
server now has segmentation enabled by default.
To avoid confusion that this text is removed from the samples page as to play the \
sample you don't need to do anything other than click.
3) Bug 270766: [Admin UI]There are some text problems on Server UI and Proxy UI
In SSL Certificates page, it should add restart warning.
In Flash Live Streams, it should add red mark for Flash Encoding Port
In admin pages,some word do not align.
Broadcasting->Encoder Redundancy:Error Message should align.
Content Mangement->View Source : Edit Path should align
Files affected:
===============
server/admin/web/build/mproxy/config_sec_cert.html
server/admin/web/build/mserver/config_broad_redun.html
server/admin/web/build/mserver/config_broad_rtmp_ingress.html
server/admin/web/build/mserver/config_sec_cert.html
server/admin/web/build/mserver/config_viewsrc.html
server/admin/web/build/mserver/samples.html
server/admin/web/build/proxy/config_sec_cert.html
server/admin/web/build/server/config_broad_redun.html
server/admin/web/build/server/config_broad_rtmp_ingress.html
server/admin/web/build/server/config_sec_cert.html
server/admin/web/build/server/config_viewsrc.html
server/admin/web/build/server/samples.html
server/admin/web/src/srvprxy/config_broad_redun.html.wasm
server/admin/web/src/srvprxy/config_broad_rtmp_ingress.html.wasm
server/admin/web/src/srvprxy/config_sec_cert.html.wasm
server/admin/web/src/srvprxy/config_viewsrc.html.wasm
server/admin/web/src/srvprxy/samples.html.wasm
Testing Performed:
===============
Integration Tests:
N/A
Performance Tests:
N/A
QA Hints
========
None.
Index: config_sec_cert.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_sec_cert.html.wasm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config_sec_cert.html.wasm 27 Sep 2012 08:08:42 -0000 1.6
+++ config_sec_cert.html.wasm 10 Oct 2012 08:48:50 -0000 1.7
@@ -30,8 +30,7 @@
];
var propList = new PropList( "SSL", serverData, propSet,null);
-var propView = new PropListView( "SSL", propList, "config.SSL.", "servvar", \
"theForm" );
-
+var propView = new PropListView( "SSL", propList, "config.SSL.", "configvar", \
"theForm" );
var theForm ;
@@ -61,15 +60,16 @@
LEFT_WIDTH( "15%" );
RIGHT_WIDTH( "68%" );
FORM_STYLE( "NOWRAP");
+ RESTART_WARNING( 1 );
@>
<@= tabHeader @>
<@= formTableTag @>
-<@= formElemText( "Key", name => "Key" ); @>
+<@= formElemText( "Key", name => "Key", RESTART_FLAG => 1 ); @>
-<@= formElemText( "Cert", name => "Cert" ); @>
+<@= formElemText( "Cert", name => "Cert", RESTART_FLAG => 1 ); @>
<@= submitResetBtns @>
<@= endHTMLTag @>
Index: config_broad_rtmp_ingress.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_broad_rtmp_ingress.html.wasm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config_broad_rtmp_ingress.html.wasm 28 Aug 2012 03:27:06 -0000 1.8
+++ config_broad_rtmp_ingress.html.wasm 10 Oct 2012 08:48:50 -0000 1.9
@@ -201,7 +201,7 @@
<@= formTableTag @>
<@= formElemText( "Mount Point", name => "MountPoint", RESTART_FLAG => 1 ); @>
- <@= formElemText( "Flash Encoding Port", name => "RTMPIngressPort", class => \
"input", size => "6"); @> + <@= formElemText( "Flash Encoding Port", name => \
"RTMPIngressPort", class => "input", size => "6", RESTART_FLAG => 1); \
@>
<@= formElemSelectYesNo( "Enable Flash Encoding", name => "Enable", class => \
"input"); @>
<@= formElemSelectYesNo( "Enable RTMP to RTSP", name => "RTMP2RTSPEnable", class \
=> "input"); @> <@
Index: config_broad_redun.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_broad_redun.html.wasm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_broad_redun.html.wasm 19 Aug 2012 08:46:33 -0000 1.4
+++ config_broad_redun.html.wasm 10 Oct 2012 08:48:50 -0000 1.5
@@ -155,15 +155,8 @@
size => "2", maxlength => "2", units => "(seconds, default is 5)" ); @>
<@= formElemSelect( "Reconnect", ["Auto", "Manual"], class => "input" ); @>
<@= formElemText( "Mount Point", size => "24", RESTART_FLAG => 1 ); @>
+ <@= formElemText( "Error Message", size => "37" ) @>
-<TR>
- <TD class="input" valign="top" align="left" colspan=2>
- <TABLE width="100%" BORDER=0 CELLSPACING=0 CELLPADDING=0>
- <@ FORM_STYLE( "WRAP" ); @>
- <@= formElemText( "Error Message", size => "37" ) @>
- </TABLE>
- </TD>
-</TR>
<@= submitResetBtns @>
<@= endHTMLTag @>
\ No newline at end of file
Index: samples.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/samples.html.wasm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- samples.html.wasm 27 Sep 2012 08:08:42 -0000 1.15
+++ samples.html.wasm 10 Oct 2012 08:48:50 -0000 1.16
@@ -180,7 +180,7 @@
</div>
<div id="wb_Text9" style="position:absolute;left:180px;top:500px;width:300px;height:180px;z-index:14;" \
align="left">
-<font style="font-size:12px" color="grey" face="??">Helix Universal Media Server can \
deliver multi-rate segmented media to the iOS devices, for both live and on-demand. \
Helix supports on-the-fly segmentation, bookmarking, live archiving, and encryption, \
among other features to the iDevices. Helix Universal Media Server also supports \
progressive download to the iDevices. You must enable segmentation before this link \
will work.</font></div> +<font style="font-size:12px" color="grey" face="??">Helix \
Universal Media Server can deliver multi-rate segmented media to the iOS devices, for \
both live and on-demand. Helix supports on-the-fly segmentation, bookmarking, live \
archiving, and encryption, among other features to the iDevices. Helix Universal \
Media Server also supports progressive download to the iDevices.</font></div> <div \
id="wb_Text10" style="position:absolute;left:30px;top:470px;width:600px;height:19px;z-index:15;" \
align="left"> <font style="font-size:12px" color="#99CC00" face="??"><b>HTTP Live \
Streaming (HTTP) </b>- iOS devices, Mac, Android and Helix Client</font></div> <div \
id="wb_Image7" style="position:absolute;left:30px;top:500px;width:96px;height:106px;z-index:16;" \
align="left"> @@ -190,7 +190,7 @@
<div id="wb_Text12" \
style="position:absolute;left:550px;top:535px;width:54px;height:14px;z-index:34;" \
align="left"> <font style="font-size:11px" color="grey" \
face="Arial">H.264</font></div>
-<div id="wb_Text1" style="position:absolute;left:180px;top:630px;width:450px;height:130px;z-index:1;" \
align="left"> +<div id="wb_Text1" \
style="position:absolute;left:180px;top:610px;width:450px;height:130px;z-index:1;" \
align="left"> <SCRIPT>document.write(linkiPhone);document.write(httpHostM3ugen + \
"/segsrc/meet.mp4");</SCRIPT></a> </div>
@@ -229,7 +229,7 @@
<div id="wb_Text25" \
style="position:absolute;left:180px;top:1040px;width:300px;height:90px;z-index:35;" \
align="left"> <font style="font-size:12px" color="grey" face="??">RealVideo 10 \
provides the highest quality streaming media experience, from narrowband to \
broadband, with VHS quality for broadband viewers and DVD quality at 1 \
Mbps.</font></div> <div id="wb_Text27" \
style="position:absolute;left:30px;top:1010px;width:600px;height:19px;z-index:36;" \
align="left">
-<font style="font-size:12px" color="#99CC00" face="??"><b>RealVideo10 (HTTP \
Progressive download) </b>- RealPlayer</font></div> +<font style="font-size:12px" \
color="#99CC00" face="??"><b>RealVideo10</b>- RealPlayer</font></div> <div \
id="wb_Image16" style="position:absolute;left:500px;top:1020px;width:44px;height:44px;z-index:39;" \
align="left"> <SCRIPT>document.write(linkRealVideo);</SCRIPT><img \
src="images/sample_play.gif" id="Image16" alt="" align="top" border="0" \
style="width:44px;height:44px;"></a> </div>
Index: config_viewsrc.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_viewsrc.html.wasm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config_viewsrc.html.wasm 19 Aug 2012 08:47:39 -0000 1.5
+++ config_viewsrc.html.wasm 10 Oct 2012 08:48:50 -0000 1.6
@@ -137,20 +137,11 @@
</TD>
<@= formTableCellRight @>
<@= formElemText( "Edit Path", name => "theEdit" ); @>
+ <@= formElemSelectYesNo( "View Source ",
+ name => "_AllowViewSource" ); @>
<BR>
-
-<@
- FORM_STYLE( "NOWRAP");
- SELECT_WIDTH( "110" );
-@>
-
- <table border="0" cellspacing="0" cellpadding="0" width="100%">
- <@= formElemSelectYesNo( "View Source ",
- name => "_AllowViewSource", class => "longInput" ); @>
-
- <@= formElemSelectYesNo( "Hide Paths ",
- name => "_HidePaths", class => "longInput" ); @>
- </TABLE>
+ <@= formElemSelectYesNo( "Hide Paths ",
+ name => "_HidePaths" ); @>
</TD>
</TR>
<@= spacerRow @>
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic