[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_rtmp_send.html.wasm, 1.13, 1.14
From:       ryuan () helixcommunity ! org
Date:       2013-09-24 4:23:42
[Download RAW message or body]

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

Modified Files:
	config_broad_rtmp_send.html.wasm 
Log Message:
Synopsis:
=========
Update RTMP push admin page

Branch: SERVER_15_1_0_RN, HEAD
Suggested Reviewers: Anyone

Description:
============
Update RTMP push admin page according to Ustream's feedback.

Files affected:
===============
server/admin/web/build/mserver/config_broad_rtmp_send.html
server/admin/web/build/server/config_broad_rtmp_send.html
server/admin/web/src/srvprxy/config_broad_rtmp_send.html.wasm

Testing Performed:
================
Unit Tests:
None

Integration Tests:

Leak Tests: None
Performance Tests: N/A

Platforms Tested: w2k8

Builds Verified: w2k8

QA Hints
========
No



Index: config_broad_rtmp_send.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_broad_rtmp_send.html.wasm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- config_broad_rtmp_send.html.wasm	14 Jun 2013 08:32:28 -0000	1.13
+++ config_broad_rtmp_send.html.wasm	24 Sep 2013 04:23:24 -0000	1.14
@@ -208,10 +208,12 @@
 		if(targetType == "Ustream")
 		{
 			curSource.m_props["StreamName"].setValue("");
+			curSource.m_props["ChannelName"].required = true;
 		}
 		else
 	    {
 			curSource.m_props["ChannelName"].setValue("");
+			curSource.m_props["ChannelName"].required = false;
 		}
 	}
 }
@@ -296,6 +298,21 @@
 	}
 	var sublist = propView.subView( 'Sources' );
 	sublist.createSubList();
+	
+	var targetType = theForm["TargetType"].value;
+	for(index in sublist.m_subListParent.m_subLists)
+	{	
+		var curSource = sublist.m_subListParent.m_subLists[index];
+		
+		if(targetType == "Ustream")
+		{
+			curSource.m_props["ChannelName"].required = true;
+		}
+		else
+	    {
+			curSource.m_props["ChannelName"].required = false;
+		}
+	}
 }
 
 function addTarget()
@@ -398,7 +415,7 @@
                           DEL => "propView.subView( 'Sources' ).removeSubList()" } ); @>
     </TD>
     <@= formTableCellRight @>
-        Source Path (Example:/broadcast/test.mp4)
+        Source Path (Example:/broadcast/testlive)
         <BR>
         <input CLASS="longInput" MAXLENGTH="255" NAME="SourcePath" SIZE="20" TYPE="text" VALUE="">
 
@@ -410,10 +427,10 @@
 		</SELECT>
 		
 		<BR>
-		<span id="ChannelNameDes">Ustream Channel (without it, a random channel will be used)</span>
+		<span id="ChannelNameDes">Ustream Channel</span>
         <input CLASS="longInput" MAXLENGTH="255" NAME="ChannelName" SIZE="20" TYPE="text" VALUE="">
 
-        <span id="StreamNameDes">Stream Name (Optional)</span>
+        <span id="StreamNameDes">Stream Name</span>
         <input CLASS="longInput" MAXLENGTH="255" NAME="StreamName" SIZE="20" TYPE="text" VALUE="">
     </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]