[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] admin/web/src/srvprxy config_mduap.html.wasm, 1.16,
From: athakwani () helixcommunity ! org
Date: 2007-10-31 11:04:55
Message-ID: 200710311105.l9VB59xg024292 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18425
Modified Files:
config_mduap.html.wasm
Log Message:
Synopsis
========
Fix for PR#206068: Minor issues with ERA admin page
Branches: SERVER_CURRENT_RN
Suggested Reviewer: Darrick
Description
=======
This is a bug covering a number of smaller issues with this page:
1. There shouldn't be any UAS-Names which don't have a UAS String to match against, \
but this is the case for the PacketVideoClient UAS-Name?
Not required, as discussed with Darrick, admin page should allow base only profiles \
i.e profiles without User agent string to match against.
2. Storage location should be UAS File when a new UAS Name is created (currently \
neither radio button gets selected, which apparently means it is writing to the \
config file).
Fixed with my last checkin.
3. Changing the Base profile value text box warning should only be thrown if children \
exist for that UAS-Name.
Fixed with my last checkin.
4. Text in the diaglog boxes should reflect the text in the admin system rather than \
a variable name. Version .73 of the spec has more detailed information of the text \
of error dialog boxes.
Fixed with my last checkin.
5. Remove the word "Information" from the string User Agent Settings Information, so \
as to not mess up the graphic.
Fixed with my last checkin.
6. The following installed profiles all gave a "Decode Byte Rate value must be at \
least 8000" error: PacketVideoClients, RealNetworksDesktopClients, Z105. No default \
value should trip an error dialog box. Clear these values for now.
Fixed, now system allows, blank, 0 and >= 8000 values
7. After hitting apply with a bad value (such as "a") in a field (say the
Up-
shift Depth) % or ms gets appended to the invalid value displayed in the textbox \
while waiting for a valid value to be re-entered (displays a% or ams).
Fixed with %/ms redesign.
8. Change the text color of the hard coded units descriptions to black so as to match \
the drop down unit selections.
Low priority, So not fixing it now.
Filed a seperate Bug 207024: Change the text color of the hard coded units \
descriptions to black so as to match the drop down unit selections.
9. Can we eliminate the currently selected UAS from appearing in the base profile \
list?
Fixed.
In addition changed some YesNo controls to formElemSelect because I need to add blank \
entry in all controls, which I'll do in next CR.
Files Affected:
===============
server/admin/web/src/srvprxy/config_mduap.html.wasm
server/admin/web/build/server/config_mduap.html
server/admin/web/build/mserver/config_mduap.html
server/admin/web/js/uasproplist.js.wasm
server/admin/web/build/server/uasproplist.js.wasm
server/admin/web/build/mserver/uasproplist.js.wasm
Testing Performed
=================
Tested for all issues and mention in bug.
Platforms tested: win32-i386-vc7
Browsers tested: IE-7, FireFox-2 and Netscape Browser-8.1
QA Hints
========
None.
Thanks & Regards,
Ashish
Index: config_mduap.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_mduap.html.wasm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config_mduap.html.wasm 22 Oct 2007 09:41:20 -0000 1.16
+++ config_mduap.html.wasm 31 Oct 2007 11:04:51 -0000 1.17
@@ -77,7 +77,7 @@
[
new UASPropObj('RetrieveXWAPProfiles', "Yes", false, false, null, null, \
"", "Retrieve XWAP Profiles"),
new UASPropObj('VideoPreDecoderBufferSize', "", false, false, 1, null, \
'int', "Video PreDecoder Buffer Size"),
- new UASPropObj('VideoDecodeByteRate', "", false, false, 8000, null, \
'int', "Video Decode Byte Rate") + new UASPropObj('VideoDecodeByteRate', "", \
false, false, null, null, 'videoDecodeBR', "Video Decode Byte Rate") ];
var typeClientAdap;
@@ -353,6 +353,7 @@
setCtrlValue(theForm[prop.name], val, true);
}
+
//Now there are value and unit control which are not associated with any propObj,
//for these control explicit syncing is required.
function syncCtrl()
@@ -376,7 +377,27 @@
{
var selectedProfile = this.getSubList();
+ //Update the BaseProfile List with the newer values.
+ while (getElem("BaseProfile").length)
+ {
+ getElem("BaseProfile").remove(0);
+ }
+
+ //A Blank entry is needed for representing removal
+ // of Base Profile Prop for the UAS.
+ addOption(theForm.BaseProfile, "");
+
+ for (var profileName in propList.subLists())
+ {
+ if (profileName != selectedProfile.m_name)
+ {
+ addOption(getElem("BaseProfile"), profileName);
+ }
+ }
+
+ selectedProfile.fillForm(theForm);
populateAllCtrls(selectedProfile);
+
MatchUsrAgntPropView.m_oES.sync();
//We need to split units for some variables.
@@ -556,20 +577,6 @@
//Re-resolve Inheritance.
enumPropArray(propList.subLists(), FlattenInheritanceCallback, 1);
- if(this.getSubList().m_parent == "UserAgentProfiles")
- {
- //Update the BaseProfile List with the newer values.
- while (getElem("BaseProfile").length)
- {
- getElem("BaseProfile").remove(0);
- }
-
- //A Blank entry is needed for representing removal
- // of Base Profile Prop for the UAS.
- addOption(theForm.BaseProfile, "");
- onBaseLoad();
- }
-
this.fillFormFromSubList(false);
if (winResults && (!winResults.closed))
@@ -736,14 +743,6 @@
selectbox.options.add(optn);
}
-function onBaseLoad()
-{
- for (var basePro in propList.subLists())
- {
- addOption(theForm.BaseProfile, basePro.toString());
- }
-}
-
function UASaveLocation(bFileSource)
{
setRadioCtrlValue(theForm.SaveLocationRadioOption, bFileSource);
@@ -950,7 +949,9 @@
{
//This will set the values of the associated props based on the Enable Client \
Adaptation selection. var value = clientAdapControl.value;
+
var selectedProfile = propView.getSubList();
+
var clientAdapProp = \
selectedProfile.subList("RateAdaptation").subList("ClientAdaptation"); \
clientAdapProp.prop("EnableHelixAdaptation").setValue(value); \
clientAdapProp.prop("Enable3GPPAdaptation").setValue(value); @@ -958,10 +959,10 @@
clientCapProp.prop("UseRDTClientBufferReports").setValue(value);
clientCapProp.prop("UseNADUFeedback").setValue(value);
clientCapProp.prop("NADUReportFrequency").setValue(value);
-
+
if (theForm.UseServerSideRateAdaptation.value != "never")
{
- var TargetTimeStyle = clientAdapControl.value == "0" ?
+ var TargetTimeStyle = isBlank(clientAdapControl.value) || \
clientAdapControl.value == "0" ?
"<@=TEXT('CSS_INPUT_NOTACTIVE_COLOR')@>" :
"<@=TEXT('CSS_INPUT_COLOR')@>";
@@ -981,7 +982,6 @@
function onLoad()
{
theForm = document.theForm;
- onBaseLoad();
enumPropArray(propList.subLists(), FlattenInheritanceCallback, 1);
propView.addSubView(MatchUsrAgntPropView);
propView.onLoad(window);
@@ -1053,7 +1053,8 @@
</TD>
<td class="input" valign="top" width="<@=RIGHT_WIDTH()@> align="right"">
<@= formElemSelect( "Use Server-Side Rate Adaptation",
- {"clientselect" => "Client Select"
+ {"" => ""
+ , "clientselect" => "Client Select"
, "always" => "Always"
, "never" => "Never"},
name => "UseServerSideRateAdaptation", onChange => \
"USSRateAdaptEvntHandler(this)"); @> @@ -1065,7 +1066,7 @@
<@= formElemSelect( "Base Profile",
{"" => ""},
- name => "BaseProfile", onLoad => "onBaseLoad()"); \
@> + name => "BaseProfile"); @>
<br>
<@= formElemSelect( "Default Profile Values",
@@ -1082,8 +1083,11 @@
<@= tabHeader ("Rate Adaptation"); @>
<@= formTableTag (FORM_STYLE("NOWRAP"));@>
- <@= formElemSelectYesNo( "Enable Client Adaptation",
- class => "input", name => "ClientAdapYesNo", align=> \
"left", onchange => "onEnableClientAdaptationChange(this)" ); @> + <@= \
formElemSelect( "Enable Client Adaptation", + \
{ "" => "" + , "1" => "Yes"
+ , "0" => "No"},
+ class => "input", name => "ClientAdapYesNo", align=> \
"left", onchange => "onEnableClientAdaptationChange(this)"); @>
<@= formElemText( TEXT("Default Media Rate"), class => "input", name => \
"DefaultMediaRate", units=> "bytes per second", width=>"2"); @>
@@ -1103,8 +1107,8 @@
</select> <SPAN CLASS="unitsOffset"></SPAN>| ); \
@>
<input type="hidden" class="input" \
name="DownshiftDepth"/>
-
<@= formElemText( TEXT("Stream Switch Delay"), class => "input", name => \
"StreamSwitchDelay", units=> "milliseconds" ); @> +
<@= formElem( "Target-time Up-shift Depth",
qq|<input class="input" \
name="TargetTimeUpshiftDepthValue" size="10">|.
qq|</input><select class="input" \
name="TargetTimeUpshiftDepthUnit"> @@ -1128,7 +1132,6 @@
<@= tabHeader ("Rate Control"); @>
<@= formTableTag (FORM_STYLE("NOWRAP"));@>
<@= formElemText( TEXT("Max Send Rate"), class => "input", name => \
"MaxSendRate", units=> "bytes per second" ); @>
-
<!-- </TABLE>
<@= formTableTag @> -->
<@= helpText(qq|<TR><td class="input" valign="top">
@@ -1140,7 +1143,12 @@
<@= formElemText( TEXT("Video Predecode Buffer Size"), class => "input", \
name => "VideoPreDecoderBufferSize", units=> "bytes" ); @>
<@= formElemText( TEXT("Video Decode Byte Rate"), class => "input", name => \
"VideoDecodeByteRate", units=> "bytes per second" ); @>
- <@= formElemSelectYesNo( "Retrieve X-WAP Profiles", class => "input", name \
=> "RetrieveXWAPProfiles" ); @> +
+ <@= formElemSelect( "Retrieve X-WAP Profiles",
+ { "" => ""
+ , "1" => "Yes"
+ , "0" => "No"},
+ class => "input", name => "RetrieveXWAPProfiles"); @>
<!-- </TABLE><@= formTableTag@> -->
<@= helpText(qq|<TR><td class="input" valign="top"><font color="gray" \
size="1">Client Capabilities variables control the function and reporting of client \
feedback information.</font></td></TR>|); @></TABLE>
_______________________________________________
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