You are viewing a plain text version of this content. The canonical link for it is here.
Posted to stonehenge-commits@incubator.apache.org by dr...@apache.org on 2009/04/28 22:20:52 UTC

svn commit: r769572 [2/4] - in /incubator/stonehenge/trunk/stocktrader/dotnet: business_service/BusinessServiceConfigurationSettings/ business_service/BusinessServiceConsole/ business_service/OrderProcessorASyncClient/ common/ServiceConfigurationSettin...

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx Tue Apr 28 22:20:50 2009
@@ -1,5 +1,4 @@
-<%@ Register TagPrefix="controls" TagName="AccountOrders" Src = "Controls/AccountOrders.ascx"  %>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true"
    EnableViewState="false" EnableEventValidation="false"
    CodeFile="Account.aspx.cs" Inherits="Trade.Web.Account" %>
<%@ Register TagPrefix="controls" TagName="ClosedOrders" Src="Controls/ClosedOrders.ascx"  %>
<%@ Register TagPrefix="controls" TagName="AccountOrders" Src="Controls/AccountOrders.ascx"  %>
<%@ Import Namespace="Trade.StockTraderWebApplicationModelClasses" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
<% /* 
 Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
@@ -13,223 +12,9 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- -->
- 
-<%@ Register TagPrefix="controls" TagName="ClosedOrders" Src = "Controls/ClosedOrders.ascx"  %>
-<%@ Page Language="C#" AutoEventWireup="false" EnableViewState="false" EnableEventValidation="false" CodeFile="Account.aspx.cs" Inherits="Trade.Web.Account" %>
-<%@Import Namespace="Trade.StockTraderWebApplicationModelClasses" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css"/>
-<title>.NET StockTrader Account Information</title>
-<link rel="stylesheet" href="StockTrader.css" type="text/css" />
-</head>
-<body class="StockTraderBodyStyle">
-<!--------------------------Begin Main Web Form Declaration--------------------------------->
-<div>
-<form runat="server" id="AccountForm" style="margin:0;">  
-<!-------------------------Begin Global Header + Order Alert Control------------------------>
-<controls:ClosedOrders id="ClosedOrdersControl" runat="server" ></controls:ClosedOrders>
-<!--------------------------End Global Header Table Declaration ---------------------------->
-<!-------------------- -----Start Portfolio Page-Specific Processing------------------------>
-<table class="TradeHomeTableStyle" style="padding-left:4px;padding-right:4px">
-    <tr>
-    <td colspan="2"> <br /></td>
-</tr>
-    <tr>
-        <td>
-        <table class="SubHeaderTableStyle">
-        <tr>
-            <th class="SubHeaderStyle">Account Information</th>
-            <th class="TodaysDateStyle"><asp:Label ID="Date" runat="server"></asp:Label></th>
-        </tr>
-    </table>
-        </td>
-    </tr>
-    <tr>
-    <td style="text-align:center"><br /><br />
-    <table class="OrderAlertTableStyle">
-    <tr>
-        <td colspan="15"><br /><br />
-            <asp:Label ID="WASLimit" runat="server"></asp:Label></td>
-    </tr>
-    <tr>
-        <td class="AccountSubHeadStyle" style="text-align:left">Total Orders Shown:<b><asp:Label
-            ID="NumOrdersShown" runat="server" Text="numOrders"></asp:Label></b></td>
-            <td colspan="10" style="text-align:center;padding-bottom:24px"> 
-        <table style="border-collapse:collapse">
-        <tr>
-            <th class="InnerHeading2" style="text-align:center">Subtotal Buys</th>
-            <th class="InnerHeading2" style="text-align:center">Subtotal Sells</th>
-            <th class="InnerHeading2" style="text-align:center">Subtotal Fees</th>
-            <th class="InnerHeading2" style="text-align:center">Net Impact Cash Balance</th>
-        </tr>
-        <tr>
-            <td class="InnerData" style="text-align:right"><%=string.Format("{0:C}", AccountOrdersControl.orderData.subtotalBuy)%></td>
-            <td class="InnerData" style="text-align:right"><%=string.Format("{0:C}", AccountOrdersControl.orderData.subtotalSell)%></td>
-            <td class="InnerData" style="text-align:right"><%=string.Format("{0:C}", AccountOrdersControl.orderData.txnFeesSubtotal)%></td>
-            <td class="InnerData" style="text-align:right"><%=AccountOrdersControl.orderData.netImpactCashBalance%></td>
-        </tr>
-        </table>
-        </td>
-        <td class="AccountSubHeadStyle" style="text-align:right"><asp:Label ID="orderLink" runat="server"></asp:Label>
-       </td>
-    </tr>
-    </table>
-    </td>
-    </tr>
-    <tr>
-<!-------------------------------------Get Orders Control ---------------------------------->    
-    <td style="text-align:center"><controls:AccountOrders id="AccountOrdersControl" runat="server" ></controls:AccountOrders></td>
-<!-------------------------------------Get Orders Control ---------------------------------->    
-    </tr>
-    <tr>
-    <td style="text-align:center;">
-    <br /><br />
-    <table class="AccountTableStyle">
-    <tr >
-    <td colspan="4" style="height:20px;padding-top:5px"><b><asp:Label ID="UpdateMessage" runat="server" Text="Update Account Profile: " ForeColor="#003f5f"></asp:Label></b>
-    <br />
-    <hr style="vertical-align:top"/>
-    </td>
-    </tr>
-    <tr>
-    <td>
-        <table style="width:600px">
-            <tr>
-                <td style="text-align:right">Full Name:</td>
-                <td style="text-align:left"><asp:TextBox ID="FullName" runat="server" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-                 <td style="text-align:right">Email Address:</td>
-                <td style="text-align:left"><asp:TextBox ID="Email" runat="server" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-            </tr>
-            <tr>
-                <td style="text-align:right">Address:</td>
-                <td style="text-align:left"><asp:TextBox ID="Address" runat="server" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-                <td style="text-align:right">Password:</td>
-                <td style="text-align:left"><asp:TextBox ID="Password" runat="server" TextMode="Password" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-            </tr>
-            <tr>
-                <td style="text-align:right">Credit Card:</td>
-                <td style="text-align:left"><asp:TextBox ID="CreditCard" runat="server" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-                <td style="text-align:right">Confirm Password:</td>
-                <td style="text-align:left"><asp:TextBox ID="ConfirmPassword" runat="server" TextMode="Password" MaxLength="100" BackColor="#EBEBEB" BorderColor="#d4d8db"></asp:TextBox></td>
-            </tr>
-         </table>
-     </td>
-    </tr>
-    <tr>
-    <td colspan="4" style="text-align:center"><div class="LinkButtonStyle" style="padding-left:19px"><asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="False" CssClass="Button">Update</asp:LinkButton></div>
-    <br />
-        <asp:ValidationSummary ID="ValidationSummary1" runat="server" DisplayMode="List"
-            ValidationGroup="AccountEntry" />
-    </td>
-    </tr>
-    <tr>
-    <td>
-        <table style="width:710px; border-collapse:collapse;">
-            <tr>
-                <td class="AccountDataHeaderStyle1">
-                <a href="Glossary.aspx">Account ID:</a></td>
-                <td class="AccountDataLabelStyle1">
-                <asp:Label ID="AccountID" runat="server"></asp:Label></td>
-                <td class="AccountDataHeaderStyle2">
-                <a href="Glossary.aspx">Account Created:</a></td>
-                <td class="AccountDataLabelStyle2">
-                <asp:Label ID="CreationDate" runat="server"></asp:Label></td>
-            </tr>
-            <tr>
-                <td class="AccountDataHeaderStyle1">
-                <a href="Glossary.aspx">User ID:</a></td>
-                <td class="AccountDataLabelStyle1">
-                <asp:Label id="Name" runat="server"></asp:Label></td>
-                <td class="AccountDataHeaderStyle2">
-                <a href="Glossary.aspx">Last Login:</a></td>
-                <td class="AccountDataLabelStyle2">
-                <asp:Label ID="LastLogin" runat="server"></asp:Label></td>
-            </tr>
-            <tr>
-                <td class="AccountDataHeaderStyle1">
-                <a href="Glossary.aspx">Opening Balance:</a></td>
-                <td class="AccountDataLabelStyle1">
-                <asp:Label ID="OpenBalance" runat="server"></asp:Label></td> 
-                <td class="AccountDataHeaderStyle2">
-                <a href="Glossary.aspx">Total Logins:</a></td>
-                <td class="AccountDataLabelStyle2">
-                <asp:Label ID="LoginCount" runat="server"></asp:Label></td>                            
-            </tr>
-            <tr>
-                <td class="AccountDataHeaderStyle1">
-                <a href="Glossary.aspx">Cash Balance:</a></td>
-                <td class="AccountDataLabelStyle1">
-                <asp:Label ID="Balance" runat="server"></asp:Label></td>
-                <td class="AccountDataHeaderStyle2">
-                <a href="Glossary.aspx">Total Logouts:</a></td>
-                <td class="AccountDataLabelStyle2">
-                <asp:Label id="TotalLogout" runat="server"></asp:Label></td>
-            </tr>
-            </table>
-            </td>
-            </tr>
-        </table>
-    </td>
-    </tr>
-    <tr>
-    <td>
-        <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ControlToValidate="Email"
-            Display="None" ErrorMessage="Please Enter an Email" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
-        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="CreditCard"
-            Display="None" ErrorMessage="Please Enter a Credit Card" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
-        <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="Address"
-            Display="None" ErrorMessage="Please Enter an Address" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
-        <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="FullName"
-            Display="None" ErrorMessage="Please Enter a Name" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
-        <asp:RequiredFieldValidator ID="RequiredFieldValidator5" runat="server" ControlToValidate="Password"
-            Display="None" ErrorMessage="Please Enter a Password" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
-        <asp:CompareValidator ID="CompareValidator1" runat="server" ControlToCompare="Password"
-            ControlToValidate="ConfirmPassword" Display="None" ErrorMessage="Passwords Do Not Match!"
-            ValidationGroup="AccountEntry"></asp:CompareValidator><br />
-    </td>
-    </tr>
-<!-------------------------------Start Get Quote Input Form/Footer-------------------------->
-<tr>
-<td>
-<table class="GetQuotesTableStyle">
-<tr>
-<td colspan="3"> <hr style="vertical-align:bottom"/></td>
-</tr>
- <tr><td style="text-align:center;" >
- <table style="width:600">
-    <tr>
-        <td style="width:100px;height:30px;text-align:right">
-            <asp:TextBox ID="symbols" BackColor="#EBEBEB"    runat="server" Text="s:0;s:1;s:2;s:3"></asp:TextBox>
-        </td>
-        <td style="padding-left:6px;padding-bottom:4px;"><div class="LinkButtonQuoteStyle">
-            <asp:LinkButton ID="LinkButtonQuote" runat="server" CssClass="Button" PostBackUrl="~/Quotes.aspx">Get Quote</asp:LinkButton></div>
-        </td>
-    </tr>
-  </table>          
-</td></tr>
-</table>
-</td>
-</tr>
-</table>
-</form>
-</div>
-<!-------------------------------Start StockTrader Footer----------------------------------->
-<table class="FooterTableStyle">
-    <tr>
-            <td class="FooterLeftStyle">
-            Apache Stonehenge Incubator Project</td>
-            <td class="FooterRightStyle">
-            .NET StockTrader</td>
-    </tr>
-    <tr>
-            <td colspan="2" class="FooterCopyRightStyle"><br />
-            Created with Visual Studio and the Microsoft .NET Framework 3.5 
-            </td>
-    </tr>
-</table> 
-</table>         
-</body>
-</html>
\ No newline at end of file
+*/ %>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

    <controls:ClosedOrders id="ClosedOrdersControl" runat="server" ></controls:ClosedOrders>

    <div class="main-title">
        <h1>Account Information</h1>
        <script type="text/javascript">
            var thisdate = new Date();
    		document.writeln(thisdate.toLocaleString());
    	</script>
	</div> 
    
    <table class="table-outer" cellspacing="0" align="center">
	    <thead>
	        <tr>
	            <th>Subtotal Buys</th>
	            <th>Subtotal Sells</th>
	            <th>Subtotal Fees</th>
	            <th>Net Impact Cash Balance</th>
	        </tr>
	    </thead>
	    <tbody>
	        <tr>
	            <td class="currency"><%=string.Format("{0:C}", AccountOrdersControl.orderData.subtotalBuy)%></td>
	            <td class="currency"><%=string.Format("{0:C}", AccountOrdersControl.orderData.subtotalSell)%></td>
	            <td class="currency"><%=string.Fo
 rmat("{0:C}", AccountOrdersControl.orderData.txnFeesSubtotal)%></td>
                <td class="currency"><%=AccountOrdersControl.orderData.netImpactCashBalance%></td>
             </tr>
        </tbody>
    </table>
+   
    <asp:Label ID="WASLimit" runat="server" />
    
    <p style="float:right;"><asp:Label ID="orderLink" runat="server"></asp:Label></p>
    
    <p>Total Orders Shown: <b><asp:Label ID="NumOrdersShown" runat="server" Text="numOrders" /></b></p>
        
    <controls:AccountOrders id="AccountOrdersControl" runat="server" />
                                                                    
    <table class="profile" cellspacing="0" width="100%">
        <thead>
            <tr>
+                <th>
                    <asp:Label ID="UpdateMessage" runat="server" Text="Update Account Profile: " />
                </th>
            </tr>
+        </thead>
        <tbody>
            <tr>
+                <td>
                    <table cellspacing="0" align="center">
                        <tr>
                            <td>
                                Full Name:
                            </td>
                            <td>
                                <asp:TextBox ID="FullName" runat="server" MaxLength="100" Width="200px" />
                            </td>
                            <td>
                                Email Address:
                            </td>
                            <td>
                                <asp:TextBox ID="Email" runat="server" MaxLength="100" Width="200px" />
                            </td>
                        </tr>
                        <tr>
                            <td>
                                Address:
                            </td>
                            <td>
                                <asp:TextBox ID="Address" runat="server" MaxLength="100" Width="200px" />
     
                        </td>
                            <td>
                                Password:
                            </td>
                            <td>
                                <asp:TextBox ID="Password" runat="server" TextMode="Password" MaxLength="100" Width="200px" />
                            </td>
                        </tr>
                        <tr>
                            <td>
                                Credit Card:
                            </td>
                            <td>
                                <asp:TextBox ID="CreditCard" runat="server" MaxLength="100" Width="200px" />
                            </td>
                            <td>
                                Confirm Password:
                            </td>
                            <td>
                                <asp:TextBox ID="ConfirmPassword" runat="server" TextMode="Password" MaxLength="100" Width="200px" />
                          
   </td>
                        </tr>
                        <tr>
                            <td colspan="4" style="text-align:center">
                                <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="FullName"
                                    Display="None" ErrorMessage="Please Enter a Name" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
                                <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ControlToValidate="Email"
                                    Display="None" ErrorMessage="Please Enter an Email" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
                                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="Address"
                                    Display="None" ErrorMessage="Please Enter an Address" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>        
 
                                <asp:RequiredFieldValidator ID="RequiredFieldValidator5" runat="server" ControlToValidate="Password"
                                    Display="None" ErrorMessage="Please Enter a Password" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
                                <asp:CompareValidator ID="CompareValidator1" runat="server" ControlToCompare="Password"
                                    ControlToValidate="ConfirmPassword" Display="None" ErrorMessage="Passwords Do Not Match!"
                                    ValidationGroup="AccountEntry"></asp:CompareValidator>
                                <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="CreditCard"
                                    Display="None" ErrorMessage="Please Enter a Credit Card" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
                            
                                <asp:ValidationSumm
 ary ID="ValidationSummary1" runat="server" DisplayMode="List"
                                    ValidationGroup="AccountEntry" />
                            </td>
                        </tr>
                        <tr>
                            <td colspan="4" class="button">
                                <asp:Button ID="UpdateProfileButton" runat="server" CausesValidation="False" CssClass="button" Text="Update" />
                            </td>
                        </tr>
                    </table>
                    
                    <br /><br />
                    
                    <table align="center" class="profile-content" cellspacing="0">
                        <tbody>
                            <tr>
                                <td class="left">
                                    Account ID:
                                </td>
                                <td>
                                    <asp:Label ID="AccountID" runat="se
 rver" />
                                </td>
                                <td class="left">
                                    Account Created
                                </td>
                                <td>
                                    <asp:Label ID="CreationDate" runat="server" />
                                </td>
                            </tr>
                            <tr>
                                <td class="left">
                                    User ID:
                                </td>
                                <td>
                                    <asp:Label id="Name" runat="server" />
                                </td>
                                <td class="left">
                                    Last Login:
                                </td>
                                <td>
                                    <asp:Label ID="LastLogin" runat="server" />
                                </td>
   
                          </tr>
                            <tr>
                                <td class="left">
                                    Opening Balance:
                                </td>
                                <td>
                                    <asp:Label ID="OpenBalance" runat="server" />
                                </td>
                                <td class="left">
                                    Total Logins:
                                </td>
                                <td>
                                    <asp:Label ID="LoginCount" runat="server" />
                                </td>
                            </tr>
                            <tr>
                                <td class="left">
                                    Cash Balance:
                                </td>
                                <td>
                                    <asp:Label ID="Balance" runat="server" />
             
                    </td>
                                <td class="left">
                                    Total Logouts:
                                </td>
                                <td>
                                    <asp:Label id="TotalLogout" runat="server" />
                                </td>
                            </tr>
                        </tbody>
                    </table>
                </td>
            </tr>
+        </tbody>
    </table>
    
    
    <div class="bottom">
        <asp:TextBox ID="symbols" runat="server" Text="s:0;s:1;s:2;s:3"></asp:TextBox>
        <asp:Button ID="GetQuoteButton" runat="server" PostBackUrl="~/Quotes.aspx" CssClass="button" Text="Get Quote" />
    </div>

</asp:Content>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs Tue Apr 28 22:20:50 2009
@@ -38,22 +38,24 @@
         //
         protected override void OnPreRender(EventArgs e)
         {
-            Date.Text = DateTime.Now.ToString("f");
-            string action = Input.InputText(Request["action"], 20);
-            if (action == "showtoporders"
+            string userid = HttpContext.Current.User.Identity.Name;
+            string action = Request.QueryString["action"] ?? string.Empty;
+
+            if (action.Equals("showtoporders", StringComparison.InvariantCultureIgnoreCase)
                 && (Settings.interfaceMode == StockTraderUtility.ACCESS_PHP_Http_WebService
                     || Settings.interfaceMode == StockTraderUtility.ACCESS_WSAS_Http_WebService))
             {
-               NumOrdersShown.Text = AccountOrdersControl.totalOrders.ToString() ;
+                NumOrdersShown.Text = AccountOrdersControl.totalOrders.ToString();
                 WASLimit.Text = "<div style=\"font-size:8pt;color:darkred\">WebSphere Trade 6.1 Returns a Maximum of 5 Orders!</div>";
             }
             else
                 NumOrdersShown.Text = AccountOrdersControl.totalOrders.ToString();
-            string userid = HttpContext.Current.User.Identity.Name;
+
             if (AccountOrdersControl.ordersRequested==Settings.MAX_DISPLAY_ORDERS)
                     orderLink.Text = "<a href=\"Account.aspx?action=showtoporders\">Show Top <b> " + Settings.MAX_DISPLAY_TOP_ORDERS.ToString() + "</b> Orders</a>";
             else
                     orderLink.Text = "<a href=\"Account.aspx\">Show Top <b>" + Settings.MAX_DISPLAY_ORDERS.ToString() + "</b> Orders </a>";
+            
             AccountDataUI customer = null;
             AccountProfileDataUI customerprofile = businessServicesClient.getAccountProfileData(userid);
             if (IsPostBack)
@@ -62,19 +64,20 @@
             }
             else
                 UpdateMessage.Text = UpdateMessage.Text + customerprofile.userID;
+            
             customer = businessServicesClient.getAccountData(userid);
             Name.Text = customer.profileID;
             AccountID.Text = customer.accountID.ToString();
-            CreationDate.Text = customer.creationDate.ToString("f");
+            CreationDate.Text = customer.creationDate.ToString("g");
             LoginCount.Text = customer.loginCount.ToString();
             OpenBalance.Text = string.Format("{0:C}", customer.openBalance);
             if (customer.balance > 0)
-                Balance.ForeColor = System.Drawing.Color.Green;
+                Balance.CssClass = Settings.GAINSTYLECSS;
             else
-                Balance.ForeColor = System.Drawing.Color.Red;
+                Balance.CssClass = Settings.LOSSSTYLECSS;
             Balance.Text = string.Format("{0:C}", customer.balance);
             TotalLogout.Text = customer.logoutCount.ToString();
-            LastLogin.Text = customer.lastLogin.ToString("f");
+            LastLogin.Text = customer.lastLogin.ToString("g");
             Password.Attributes.Add("value", customerprofile.password);
             ConfirmPassword.Attributes.Add("value", customerprofile.password);
             Email.Text = customerprofile.email;

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx Tue Apr 28 22:20:50 2009
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true"  CodeFile="AccountOrders.ascx.cs" Inherits="Trade.Web.AccountOrders" %>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+<%@ Control Language="C#" AutoEventWireup="true"  CodeFile="AccountOrders.ascx.cs" Inherits="Trade.Web.AccountOrders" %>
<% /*
 Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
@@ -13,61 +12,8 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- -->
- 
-<!--------------------------Start Order Alert ASP.NET User Control ----------------------------> 
-<asp:Repeater id="AccountOrdersRepeater" runat="server">
-          <HeaderTemplate>
-             <table class="OrderAlertTableStyle">
-            <tr>
-                <th class="InnerHeading">
-                Order ID</th>
-                <th class="InnerHeading">
-                Order Status</th>
-                <th class="InnerHeading">
-                Creation Date</th>
-                <th class="InnerHeading">
-                Completion Date</th>
-               <th class="InnerHeading">
-                Txn Fee</th>
-               <th class="InnerHeading">
-                Type</th>
-                <th class="InnerHeading">
-                Symbol</th>
-                <th class="InnerHeading">
-                Quantity</th>
-                <th class="InnerHeading">
-                Price</th>
-                <th class="InnerHeading">
-                Total</th>
-            </tr>       
-          </HeaderTemplate>
-          <ItemTemplate>
-            <tr>
-                <td class="InnerData">
-                <%# Eval("orderID")%> </td>
-                <td class="InnerData">
-                <%# Eval("orderStatus") %></td>
-                <td class="InnerData">
-                <%# Eval("openDate") %></td>
-                <td class="InnerData">
-                <%# Eval("completionDate") %> </td>
-                 <td class="InnerData" style="text-align:right">
-                <%# Eval("orderFee", "{0:C}")%></td>
-                <td class="InnerData">
-                <%# Eval("orderType")%></td>
-                <td class="InnerData">
-                <%# Eval("quoteLink")%></td>
-                <td class="InnerData" style="text-align:right">
-                <%# Eval("quantity","{0:0,0}")%></td>
-                 <td class="InnerData" style="text-align:right">
-                <%# Eval("price","{0:C}")%></td>
-                 <td class="InnerData" style="text-align:right">
-                <%# Eval("total","{0:C}")%></td>
-           </tr>      
-         </ItemTemplate>
-         <FooterTemplate>
-       </table>   
-       </FooterTemplate>
-</asp:Repeater>
-<!------------------------------End Order Alert ASP.NET User Control------------------------>
\ No newline at end of file
+*/ %>
<asp:Repeater id="AccountOrdersRepeater" runat="server">
+    <HeaderTemplate>
    <table class="table-outer" cellspacing="0" align="center">
        <thead>
            <tr>
+                <th>Order ID</th>
                <th>Order Status</th>
                <th>Creation Date</th>
                <th>Completion Date</th>
                <th>Txn Fee</th>
                <th>Type</th>
                <th>Symbol</th>
                <th>Quantity</th>
                <th>Price</th>
                <th>Total</th>
            </tr>
        </thead>
        <tbody>     
    </HeaderTemplate>
    <ItemTemplate>
            <tr>
+                <td><%# Eval("orderID")%> </td>
                <td><%# Eval("orderStatus") %></td>
                <td><%# Eval("openDate") %></td>
                <td><%# Eval("completionDate") %> </td>
                <td class="currency"><%# Eval("orderFee", "{0:C}")%></td>
                <td><%# Eval("orderType")%></td>
                <td><%# Eval("quoteLink")%></td>
                <td class="currency"><%# Eval("quantity","{0:0,0}")%></td>
                <td class="currency"><%# Eval("price","{0:C}")%></td>
                <td class="currency"><%# Eval("total","{0:C}")%></td>
           </tr>      
+    </ItemTemplate>
    <FooterTemplate>
        </tbody>
    </table>
    </FooterTemplate>
</asp:Repeater>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs Tue Apr 28 22:20:50 2009
@@ -40,10 +40,13 @@
         protected override void OnLoad(EventArgs e)
         {
             BSLClient businessServicesClient = new BSLClient();
+            
             string userid = HttpContext.Current.User.Identity.Name;
-            if (Input.InputText(Request["action"], 20) == "showtoporders" 
-                && (Settings.interfaceMode != StockTraderUtility.ACCESS_WSAS_Http_WebService
-                    || Settings.interfaceMode != StockTraderUtility.ACCESS_PHP_Http_WebService))
+            string action = Request.QueryString["action"] ?? string.Empty;
+            
+            if (action.Equals("showtoporders", StringComparison.InvariantCultureIgnoreCase)
+                && Settings.interfaceMode != StockTraderUtility.ACCESS_WSAS_Http_WebService
+                && Settings.interfaceMode != StockTraderUtility.ACCESS_PHP_Http_WebService)
             {
                 ordersRequested = Settings.MAX_DISPLAY_TOP_ORDERS;
                 orderData = businessServicesClient.getTopOrders(userid);

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx Tue Apr 28 22:20:50 2009
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true"  CodeFile="ClosedOrders.ascx.cs" Inherits="Trade.Web.ClosedOrders" %>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+<%@ Control Language="C#" AutoEventWireup="true"  CodeFile="ClosedOrders.ascx.cs" Inherits="Trade.Web.ClosedOrders" %>
<%@ Import Namespace="Trade.StockTraderWebApplicationModelClasses" %>
<% /* 
 Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
@@ -13,88 +12,4 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- -->
- 
-<%@ Import Namespace="Trade.StockTraderWebApplicationModelClasses" %>
-<%@ Import Namespace="Trade.StockTraderWebApplicationSettings" %>
-<!--------------------------The Common Header + Order Alert ASP.NET User Control --------------> 
-<table class= "HeaderTableStyle">
-    <tr>
-		<td><img alt="" src="Images/dotnet_logo.jpg" height="63"/></td>
-        <td class="HeaderLeftStyle">.NET StockTrader
-            </td>
-        <td class="HeaderRightStyle">Apache Stonehenge Incubator Project</td>
-    </tr>
-</table>
-<table class="MenuTableStyle">
-    <tr>
-            <td class="Menu"><a href="Default.aspx">Welcome</a></td>
-            <td class="Menu"><a href="TradeHome.aspx">Home</a></td>
-            <td class="Menu"><a href="account.aspx">Account</a></td>
-            <td class="Menu"><a href="portfolio.aspx">Portfolio</a></td>
-            <td class="Menu"><a href="quotes.aspx?symbols=s:0,s:1,s:2,s:3,s:4">Quotes/Trade</a></td>
-            <td class="Menu"><a href="Glossary.aspx">Glossary</a></td>
-            <td class="Menu"><a href="logout.aspx">Login/Logout</a></td>
-            <td class="Menu"><a href="ReadMe.mht" target="_blank">Read Me</a></td>
-                      
-    </tr>
-</table>    
-<!--------------------------End Global Header Table Declaration ---------------------------->
-<table class="TradeHomeTableStyle">
-<% if (closedOrderData!=null)
-    if (closedOrderData.Count>0)
-               {%> 
-       <tr>    
-            <td colspan="8">
-             <table class="OrderAlertTableStyle">
-             <tr >
-                <td colspan="8" class="OrderAlertMessageStyle">Trade Alert: The following orders have completed.</td>
-             </tr>
-             <tr>
-                <th class="InnerHeading">
-                Order ID</th>
-                <th class="InnerHeading">
-                Order Status</th>
-                <th class="InnerHeading">
-                Creation Date</th>
-                <th class="InnerHeading">
-                Completion Date</th>
-               <th class="InnerHeading">
-                Txn Fee</th>
-               <th class="InnerHeading">
-                Type</th>
-                <th class="InnerHeading">
-                Symbol</th>
-                <th class="InnerHeading">
-                Quantity</th>
-            </tr>     
-            
-            <%for (int i=0; i<closedOrderData.Count; i++)
-                   { %>  
-            <tr>
-                <td class="InnerData">
-                <%=closedOrderData[i].orderID%> </td>
-                <td class="InnerData">
-                <%=closedOrderData[i].orderStatus%></td>
-                <td class="InnerData">
-                <%=closedOrderData[i].openDate%></td>
-                <td class="InnerData">
-                <%=closedOrderData[i].completionDate%> </td>
-                 <td class="InnerData" style="text-align:right">
-                <%=closedOrderData[i].orderFee.ToString("C")%></td>
-                <td class="InnerData">
-                <%=closedOrderData[i].orderType%></td>
-                <td class="InnerData">
-                <%=closedOrderData[i].quoteLink%></td>
-                 <td class="InnerData" style="text-align:right">
-                <%=closedOrderData[i].quantity.ToString("N")%></td>
-            </tr>      
-            <%}%>
-            </table>
-            <br />
-            
-       </td>
-    </tr>
-  <%  } %>
-</table>    
-<!------------------------------End Order Alert Repeater Display ASP.NET User Control---------->
\ No newline at end of file
+*/
if (closedOrderData != null && closedOrderData.Count > 0)
   {%> 
        <!------------------------------Order Alert Repeater Display ASP.NET User Control---------->              
        <p style="color:red" align="center">Trade Alert: The following orders have completed.</p>
        <table class="table-outer" cellspacing="0" align="center">
            <thead>
		        <tr>
		            <th>Order ID</th>
		            <th>Order Status</th>
			        <th>Creation Date</th>
			        <th>Completion Date</th>
			        <th>Txn Fee</th>
			        <th>Type</th>
			        <th>Symbol</th>
			        <th>Quantity</th>
		        </tr>
	        </thead>
	        <tbody>
	          <%for (int i=0; i<closedOrderData.Count; i++)
                { %>  
                    <tr>
                        <td><%=closedOrderData[i].orderID%></td>
                        <td><%=closedOrderData[i].orderStatus%></td>
                        <td><%=closedOrderData[i].openDate%></td>
  
                       <td><%=closedOrderData[i].completionDate%> </td>
                        <td style="text-align:right"><%=closedOrderData[i].orderFee.ToString("C")%></td>
                        <td><%=closedOrderData[i].orderType%></td>
                        <td><%=closedOrderData[i].quoteLink%></td>
                        <td style="text-align:right"><%=closedOrderData[i].quantity.ToString("N")%></td>
                    </tr>      
               <%}%>
	        </tbody>
        </table>
        <br/><br/>
        <!------------------------------End Order Alert Repeater Display ASP.NET User Control---------->        
<% } %>    
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/ClosedOrders.ascx.cs Tue Apr 28 22:20:50 2009
@@ -77,7 +77,7 @@
             if (userid == "")
             {
                 HttpCookie authcookie = Request.Cookies[FormsAuthentication.FormsCookieName];
-                if (authcookie.Equals(null))
+                if (authcookie == null)
                 {
                     FormsAuthentication.SignOut();
                     Response.Redirect(Settings.PAGE_LOGIN);

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx Tue Apr 28 22:20:50 2009
@@ -17,73 +17,37 @@
  
 <%@OutputCache Duration="60" VaryByParam="none"%>
 <%@Import Namespace = "Trade.StockTraderWebApplicationSettings" %>
-<!---------------------------Start MarketSummary ASP.NET User Control----------------------->
-<table class="MarketSummaryControlTableStyle">
-    <tr >
-       <td colspan="2" class="MarketSummaryMasterHeader">Market Summary<div style="font-size:smaller">
-       <asp:Label ID="summaryDate" runat="server" Text="summaryDate"></asp:Label></div></td>
-    </tr>
-    <tr >
-       <th class="MarketSummaryHeader"><a href="/Glossary.aspx" class="MktSummary">Trade Stock<br />Index (TSIA)</a></th>
-       <td class="MarketSummaryLeftSubHeader">
-       <asp:Label ID="TSIA" runat="server" Text="TSIA"></asp:Label>
+<!--             Start MarketSummary ASP.NET User Control                     -->
<h3>Market Summary</h3>
<table class="table-outer" cellspacing="0" style="width:100%">
    <tr>
       <td colspan="2"><div style="font-size:smaller"><asp:Label ID="summaryDate" runat="server" Text="summaryDate"></asp:Label></div></td>
    </tr>
+    <tr>
       <td class="special"><a href="/Glossary.aspx">Trade Stock<br />Index (TSIA)</a></td>
       <td>
       <asp:Label ID="TSIA" runat="server" Text="TSIA"></asp:Label>
        <asp:Label ID="GainPercent" runat="server" Text="Gain"></asp:Label></td>
     </tr>
-    <tr >
-       <th class="MarketSummaryHeader"><a href="/Glossary.aspx" class="MktSummary">Trading<br />Volume</a>
-       </th>
-       <td class="MarketSummaryLeftSubHeader">
-       <asp:Label ID="Volume" runat="server" Text="Volume"></asp:Label></td>
+    <tr>
       <td class="special"><a href="/Glossary.aspx">Trading<br />Volume</a></td>
       <td>
       <asp:Label ID="Volume" runat="server" Text="Volume"></asp:Label></td>
        </tr>
-    <tr >
-    <th class="MarketSummaryHeader"><a href="/Glossary.aspx" class="MktSummary">Top Gainers</a></th>
-       <td class="MarketSummaryGainerLoserHeader" style="padding-bottom:10px">
-<!---------------------------Begin Repeater for Top Gainers---------------------------------->
-       <asp:Repeater id="TopGainers" runat="server">
+    <tr>
        <td class="special"><a href="/Glossary.aspx">Top Gainers</a></td>
       <td>
       <asp:Repeater id="TopGainers" runat="server">
            <HeaderTemplate>
-              <table class="MarketSummaryControlGainersLosersTableStyle">
-                 <tr>
-                     <th class="MarketSummaryInnerHeading">Symbol</th> <th class="MarketSummaryInnerHeading">Price</th> <th class="MarketSummaryInnerHeading">Change</th>
-                 </tr>
-          </HeaderTemplate>
+              <table class="table-inner" cellspacing="0">
                 <thead>
                     <tr>
                         <th>Symbol</th>
                         <th>Price</th> 
                         <th>Change</th>
                     </tr>
                 </thead>
                 <tbody>
          </HeaderTemplate>
           <ItemTemplate>
                     <tr>
-                        <td class="MarketSummaryInnerData"><%# Eval("quoteLink")%></td>
-                        <td class="MarketSummaryInnerData" style="text-align:right"><%# Eval("priceWithArrow")%></td>
-                        <td class="MarketSummaryInnerData" style="text-align:right"><%# Eval("gainWithArrow")%></td>
-                    </tr>
+                        <td><%# Eval("quoteLink")%></td>
                        <td style="text-align:right"><%# Eval("priceWithArrow")%></td>
                        <td style="text-align:right"><%# Eval("gainWithArrow")%></td>
                    </tr>
           </ItemTemplate>
           <FooterTemplate>
-            </table>
+                </tbody>
            </table>
           </FooterTemplate>
        </asp:Repeater>
-<!---------------------------End Repeater for Top Gainers------------------------------------>
        </td>
    </tr>
-   <tr >
-       <th class="MarketSummaryHeader"> <a href="/Glossary.aspx" class="MktSummary">Top Losers</a></th>
-       <td class="MarketSummaryGainerLoserHeader" style="padding-bottom:10px">
-<!---------------------------Begin Repeater for Top Losers----------------------------------->
-       <asp:Repeater id="TopLosers" runat="server">
+   <tr>
       <td class="special"><a href="/Glossary.aspx">Top Losers</a></td>
       <td>
       <asp:Repeater id="TopLosers" runat="server">
            <HeaderTemplate>
-             <table class="MarketSummaryControlGainersLosersTableStyle">
-                <tr>
-                    <th class="MarketSummaryInnerHeading">Symbol</th> <th class="MarketSummaryInnerHeading">Price</th> <th class="MarketSummaryInnerHeading">Change</th>
-                </tr>
-           </HeaderTemplate>
+             <table class="table-inner" cellspacing="0">
                <thead>
                    <tr>
                        <th>Symbol</th> 
                        <th>Price</th>
                        <th>Change</th>
                    </tr>
                </thead>
                <tbody>
           </HeaderTemplate>
            <ItemTemplate>
                 <tr>
-                   <td class="MarketSummaryInnerData"><%# Eval("quoteLink")%> </td>
-                   <td class="MarketSummaryInnerData" style="text-align:right"><%# Eval("priceWithArrow")%></td>
-                   <td class="MarketSummaryInnerData" style="text-align:right"><%# Eval("gainWithArrow")%></td>
-                </tr>
+                   <td><%# Eval("quoteLink")%> </td>
                   <td style="text-align:right"><%# Eval("priceWithArrow")%></td>
                   <td style="text-align:right"><%# Eval("gainWithArrow")%></td>
                </tr>
            </ItemTemplate>
            <FooterTemplate>
-             </table>
+                </tbody>
             </table>
            </FooterTemplate>
         </asp:Repeater>
-<!---------------------------End Repeater for Top Losers------------------------------------->
-        </td>
+
        </td>
     </tr>  
 </table>
-<!---------------------------End MarketSummary ASP.NET User Control---------------------->
\ No newline at end of file
+<!--                        End MarketSummary ASP.NET User Control                    -->
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/MarketSummary.ascx.cs Tue Apr 28 22:20:50 2009
@@ -51,21 +51,18 @@
             List<QuoteDataUI> topLosers = marketSummaryData.topLosers;
             summaryDate.Text = DateTime.Now.ToString("f");
             TSIA.Text = String.Format("{0:N}",marketSummaryData.TSIA);
+            
             decimal gainpercent =  marketSummaryData.gainPercent;
             if (gainpercent > 0)
             {
-                GainPercent.ForeColor = System.Drawing.Color.DarkGreen;
-                GainPercent.Text = String.Format("{0:N}" + Settings.UPARROWLINK, gainpercent);
+                GainPercent.CssClass = Settings.GAINSTYLECSS;
             }
-                else if (gainpercent < 0)
-                {
-                    GainPercent.ForeColor = System.Drawing.Color.DarkRed;
-                    GainPercent.Text = String.Format("{0:N}" + Settings.DOWNARROWLINK, gainpercent);
-                }
-                    else
-                    {
-                        GainPercent.Text = String.Format("{0:N}", gainpercent);
-                    }
+            else if (gainpercent < 0)
+            {
+                GainPercent.CssClass = Settings.LOSSSTYLECSS;    
+            }
+            GainPercent.Text = String.Format("{0:N}", gainpercent);
+                    
             Volume.Text = String.Format("{0:N}", marketSummaryData.volume);
             TopGainers.DataSource = marketSummaryData.topGainers;
             TopLosers.DataSource = marketSummaryData.topLosers;

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx Tue Apr 28 22:20:50 2009
@@ -1,5 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="Trade.Web.Default" %>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true"
    CodeFile="Default.aspx.cs" Inherits="Trade.Web.Default"  %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
<% /* 
 Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
@@ -13,16 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- -->
- 
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css"/>
-<title>.NET StockTrader Welcome</title>
-<link rel="stylesheet" href="StockTrader.css" type="text/css" />
-<!--
-    Code originally contributed by Microsoft Corporation.
+*/ %>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    <!--
    Code originally contributed by Microsoft Corporation.
     This contribution to the Stonehenge project is limited strictly 
     to the source code that is submitted in this submission.  
     Any technology, including underlying platform technology, 
@@ -31,151 +21,6 @@
     For example and not by way of limitation, 
     any systems/Windows libraries (WPF, WCF, ASP.NET etc.) 
     required to run the submitted source code is not a part of the contribution
--->
-</head>
-<body class="StockTraderBodyStyle"> 
-<!--------------------------Begin Main Web Form Declaration--------------------------------->
-<div>
-<form runat="server" id="DefaultForm" style="margin:0;">  
-<!-------------------------Begin Global Header Table Declaration---------------------------->
-<table class= "HeaderTableStyle">
-    <tr>
-		<td><img alt="" src="Images/dotnet_logo.jpg" height="63"/></td>
-        <td class="HeaderLeftStyle">.NET StockTrader
-            </td>
-        <td class="HeaderRightStyle">Apache Stonehenge Incubator Project</td>
-    </tr>
-</table>
-<table class="MenuTableStyle">
-    <tr>
-            <td class="Menu"><a href="Default.aspx">Welcome</a></td>
-            <td class="Menu"><a href="TradeHome.aspx">Home</a></td>
-            <td class="Menu"><a href="account.aspx">Account</a></td>
-            <td class="Menu"><a href="portfolio.aspx">Portfolio</a></td>
-            <td class="Menu"><a href="quotes.aspx?symbols=s:0,s:1,s:2,s:3,s:4">Quotes/Trade</a></td>
-            <td class="Menu"><a href="Glossary.aspx">Glossary</a></td>
-            <td class="Menu"><a href="logout.aspx">Login/Logout</a></td>
-            <td class="Menu"><a href="ReadMe.mht" target="_blank">Read Me</a></td>
-    </tr>
-</table>    
-<!--------------------------End Global Header Table Declaration ---------------------------->
-<table class="TradeHomeTableStyle">
-<tr>
-    <td colspan="2" class="OrderAlertControlStyle"></td>
-</tr>
-<tr>
-    <td colspan="2"> <br /></td>
-</tr>
-<tr>
-    <td colspan="2">
-    <table class="SubHeaderTableStyle">
-        <tr>
-            <th class="SubHeaderStyle">Welcome!</th>
-            <th class="TodaysDateStyle"><asp:Label ID="Date" runat="server"></asp:Label></th>
-        </tr>
-    </table>
-    </td>
-</tr>
-
-<tr>
-        <td style="vertical-align:top; text-align:left;padding-left:12px; padding-right:12px; width: 381px;">
-        <p>
-        </p>
-        <br />
-        <p>
-        This application is an end-to-end sample application for .NET Enterprise Application Server technologies.
-        It is a service-oriented application based on .Net 3.5 utilizing Windows Communication Foundation 
-            (WCF) and ASP.NET, and illustrates
-        many of the .NET 3.5 enterprise development technologies that can be used for building "enterprise-connected" applications.  
-        </p>
-        <p>
-        The application also offers a rich set of interoperability options with non-Microsoft platforms.  This includes 
-        interoperability with Java-based application servers and <a href="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=trade6">IBM WebSphere's Trade 6.1</a> sample application, and open-source based front-ends and services from <a href="http://wso2.org/interop/stocktrader">
-                WSO2</a> and other vendors. The .NET services also include a data access layer for both Microsoft SQL Server and Oracle 11G databases. The application offers an excellent opportunity for developers to learn about .NET and building interoperable, service-oriented applications.
-        </p>
-        </td>       
-        <td style="padding-left:15px;">
-            <br />
-            <br />
-            <table class="TechnologiesTableStyle" >
-            <tr>
-                <th style="text-align:center; vertical-align:middle; padding-bottom:12px; font-size:12px;background-color:#112e58; color:white; height: 25px;">
-                Sample of Technologies Demonstrated</th>
-            </tr>
-            <tr style="line-height:15px">
-            <td>  <br/> 
-            <ul>
-                <li class="Mainline">
-                Service-oriented, n-tier design with ASP.NET and WCF    
-                </li>
-                <li class="Subline">
-                Clean separation of UI, business services and DB access    
-                </li>
-                <li class="Mainline">
-                .NET 3.5 with WCF</li>
-                <li class="Subline">
-                Interoperability with J2EE/WebSphere Trade 6.1   
-                </li>
-                <li class="Subline">Interoperability with Java and PHP services over
-                    <br />
-                    WS-* Advanced Web Service standards</li>
-                <li class="Subline">
-                Loosely-coupled, message-oriented design with WCF  
-                </li>
-                <li class="Subline">
-                Self-hosting WCF Services   
-                </li>
-                <li class="Subline">
-                Custom WCF Behaviors
-                </li>
-                <li class="Mainline">
-                .NET Enterprise Application Server Technologies
-                </li>
-                <li class="Subline">
-                ASP.NET 2.0 and 3.5
-                </li>
-                <li class="Subline">
-                ADO.NET 2.0
-                </li>
-            </ul>
-        </td>
-         </tr>
-         </table>
-         <br />
-        </td>
-      </tr>
-             <tr>
-                <td style="width: 381px">  
-            </td>
-        </tr>
-        <tr>
-    <td colspan="2">
-        <asp:Image ID="Image1" runat="server" ImageUrl="~/Images/trade.gif" /><br />
-        <br />
-    </td>
-</tr>
-    </table>
-</form>
-</div>
-<!-------------------------------Start StockTrader Footer----------------------------------->
-<table class="FooterTableStyle">
-    <tr>
-            <td class="FooterLeftStyle">
-            Apache Stonehenge Incubator Project</td>
-            <td class="FooterRightStyle">
-            .NET StockTrader</td>
-    </tr>
-    <tr>
-            <td colspan="2" class="FooterCopyRightStyle"><br />
-            Created with Visual Studio and the Microsoft .NET Framework 3.5 
-            </td>
-    </tr>
-</table> 
-<table>
-<tr>
-    <td style="width:770px;height:500px">
-    </td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
+    -->
    <div class="main-title">
        <h1>
            Welcome!</h1>
+        <script type="text/javascript">
			var thisdate = new Date();
			document.writeln(thisdate.toLocaleString());
        </script>

    </div>
    <div class="left">
        <p>
+            This application is an end-to-end sample application for .NET Enterprise Application
            Server technologies. It is a service-oriented application based on .Net 3.5 utilizing
            Windows Communication Foundation (WCF) and ASP.NET, and illustrates many of the
            .NET 3.5 enterprise development technologies that can be used for building "enterprise-connected"
            applications.
            <p>
                <p>
                    The application also offers a rich set of interoperability options with non-Microsoft
                    platforms. This includes interoperability with Java-based application servers and
                    <a href="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=trade6">IBM
                        WebSphere's Trade 6.1</a> sample application, and open-source based front-ends
                    and services from <a href="http://wso2.org/interop/stocktrader">WSO2</a> and other
          
           vendors. The .NET services also include a data access layer for both Microsoft SQL
                    Server and Oracle 11G databases. The application offers an excellent opportunity
                    for developers to learn about .NET and building interoperable, service-oriented
                    applications.
                </p>
                <p>
                    For more details, check <a href="http://incubator.apache.org/stonehenge">Apache Stonehenge
                        home page</a>.
                </p>
    </div>
    <div class="right">
        <h3>
            Sample of Technologies Demonstrated</h3>
        <ul>
            <li>Service-oriented, n-tier design with ASP.NET and WCF</li>
            <li>Clean separation of UI, business services and DB access</li>
            <li>.NET 3.5 with WCF</li>
            <li>Interoperability with J2EE/WebSphere Trade 6.1</li>
            <li>Interoperability with Java and PHP services over
            
     <br />
                WS-* Advanced Web Service standards</li>
            <li>Loosely-coupled, message-oriented design with WCF</li>
            <li>Self-hosting WCF Services</li>
            <li>Custom WCF Behaviors</li>
            <li>.NET Enterprise Application Server Technologies</li>
            <li>ASP.NET 2.0 and 3.5</li>
            <li>ADO.NET 2.0</li>
        </ul>
    </div>
</asp:Content>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Default.aspx.cs Tue Apr 28 22:20:50 2009
@@ -16,22 +16,14 @@
 //
 
 using System;
-using System.Web;
-using System.Web.UI;
-using Trade.StockTraderWebApplicationSettings;
 
 namespace Trade.Web
 {
-        public partial class Default : System.Web.UI.Page
+    public partial class Default : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
         {
-            protected void Page_Load(object sender, EventArgs e)
-            {
-               Date.Text = DateTime.Now.ToString("f");
-               //Settings Settings = new Settings();
-               //configlink.HRef = "http://" + HttpContext.Current.Server.MachineName + "/" + 
-               Settings settings = new Settings();
-               
-            }
         }
+    }
 }
 

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx Tue Apr 28 22:20:50 2009
@@ -1,18 +1,7 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Glossary.aspx.cs" Inherits="Trade.Web.Glossary" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css"/>
-<title>.NET StockTrader Glossary</title>
-<link rel="stylesheet" href="StockTrader.css" type="text/css" />
-</head>
-<body class="StockTraderBodyStyle">
-<!--------------------------Begin Main Web Form Declaration--------------------------------->
-<div>
-<form runat="server" id="GlossaryForm" style="margin:0;">  
-<!-------------------------Begin Global Header Table Declaration---------------------------->
-<table class= "HeaderTableStyle">
-    <tr>
<!--
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true"
+    CodeFile="Glossary.aspx.cs" Inherits="Trade.Web.Glossary" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+<% /* 
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
@@ -27,181 +16,152 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- -->
- 
-		<td><img alt="" src="Images/dotnet_logo.jpg" height="63"/></td>
-        <td class="HeaderLeftStyle">.NET StockTrader
-            </td>
-        <td class="HeaderRightStyle">Apache Stonehenge Incubator Project</td>
-    </tr>
-</table>
-<table class="MenuTableStyle">
-    <tr>
-            <td class="Menu"><a href="Default.aspx">Welcome</a></td>
-            <td class="Menu"><a href="TradeHome.aspx">Home</a></td>
-            <td class="Menu"><a href="account.aspx">Account</a></td>
-            <td class="Menu"><a href="portfolio.aspx">Portfolio</a></td>
-            <td class="Menu"><a href="quotes.aspx?symbols=s:0,s:1,s:2,s:3,s:4">Quotes/Trade</a></td>
-            <td class="Menu"><a href="Glossary.aspx">Glossary</a></td>
-            <td class="Menu"><a href="logout.aspx">Login/Logout</a></td>
-            <td class="Menu"><a href="ReadMe.mht" target="_blank">Read Me</a></td>
-
-    </tr>
-</table>    
-<!--------------------------End Global Header Table Declaration ---------------------------->
-<table class="TradeHomeTableStyle">
-<tr>
-    <td colspan="2" class="OrderAlertControlStyle"></td>
-</tr>
-<tr>
-    <td colspan="2"> <br /></td>
-</tr>
-<tr>
-    <td colspan="2">
-    <table class="SubHeaderTableStyle">
-        <tr>
-            <th class="SubHeaderStyle">Glossary</th>
-            <th class="TodaysDateStyle"><asp:Label ID="Date" runat="server"></asp:Label></th>
-        </tr>
-    </table>
-    </td>
-</tr>
-<tr>
-    <td colspan="2"><br /><br /></td>
-</tr>
-<tr>
-<td style="text-align:center">
- <table class="TermsTableStyle">
-     <tr>
-     <th class="TradeConfigTHStyle">Term</th>
-     <th class="TradeConfigTHStyle">Description</th>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Account ID</td><td class="TradeTermsTDStyleRight">A unique Integer based key. Each user is assigned an account ID at account creation time.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Account Created</td><td class="TradeTermsTDStyleRight">The time and date the users account was first created.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Cash Balance</td><td class="TradeTermsTDStyleRight"> The current cash balance in the users account. This does not include current stock holdings.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Company</td><td class="TradeTermsTDStyleRight">The full company name for an individual stock.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Current Gain/Loss</td><td class="TradeTermsTDStyleRight">The total gain or loss of this account, computed by substracting the current sum of cash/holdings minus the opening account balance.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Current Price</td><td class="TradeTermsTDStyleRight">The current trading price for a given stock symbol.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Gain/Loss</td><td class="TradeTermsTDStyleRight">The current gain or loss of an individual stock holding, computed as (current market value - holding basis).</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Last Login</td><td class="TradeTermsTDStyleRight">The date and time this user last logged in to Trade.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Market Value</td><td class="TradeTermsTDStyleRight">The current total value of a stock holding, computed as (quantity * current price).</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Number of Holdings</td><td class="TradeTermsTDStyleRight">The total number of stocks currently owned by this account.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Open Price</td><td class="TradeTermsTDStyleRight">The price of a given stock at the open of the trading session.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Order Id</td><td class="TradeTermsTDStyleRight">A unique Integer based key. Each order is assigned an order ID at order creation time.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Opening Balance</td><td class="TradeTermsTDStyleRight">The initial cash balance in this account when it was opened.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Order Status</td><td class="TradeTermsTDStyleRight">orders are opened, processed, closed and completed. Order status shows the current stat for this order.</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Price Range</td><td class="TradeTermsTDStyleRight">The low and high prices for this stock during the current trading session</td>
-     </tr>
-     <tr>
-     <td class="TradeTermsTDStyleLeft"> Purchase Date</td><td class="TradeTermsTDStyleRight">The date and time the a stock was purchased.</td>
-     </tr>
-     <tr>
-    <td class="TradeTermsTDStyleLeft"> Purchase Price</td><td class="TradeTermsTDStyleRight">The price used when purchasing the stock.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Purchase Basis</td><td class="TradeTermsTDStyleRight">The total cost to purchase this holding. This is computed as (quantity * purchase price).</td>
-     </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Quantity</td><td class="TradeTermsTDStyleRight">The number of stock shares in the order or user holding.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Session Created</td><td class="TradeTermsTDStyleRight">An HTTP session is created for each user at during login. Session created shows the time and day when the session was created.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Sum of Cash/Holdings</td><td class="TradeTermsTDStyleRight">The total current value of this account. This is the sum of the cash balance along with the value of current stock holdings.</td>
-     </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Symbol</td><td class="TradeTermsTDStyleRight">The symbol for a Trade stock.</td>
-     </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Total Logins</td><td class="TradeTermsTDStyleRight">The total number of logins performed by this user.</td>
-     </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Total Logouts</td><td class="TradeTermsTDStyleRight">The total number of logouts performed by this user.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Total of Holdings</td><td class="TradeTermsTDStyleRight">The current total value of all stock holdings in this account given the current valuation of each stock held.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Top Gainers</td><td class="TradeTermsTDStyleRight">The list of stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) gaining the most in price during the current trading session.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Top Losers</td><td class="TradeTermsTDStyleRight">The list of stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior)  falling the most in price during the current trading session.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Trade Stock Index (TSIA)</td><td class="TradeTermsTDStyleRight">A computed index of the top 20 stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) in Trade.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Trading Volume</td><td class="TradeTermsTDStyleRight">The total number of shares traded for stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) during this trading session.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Txn Fee</td><td class="TradeTermsTDStyleRight">The fee charged by the brokerage to process this order.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Type</td><td class="TradeTermsTDStyleRight">The order type (buy or sell).</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> User ID</td><td class="TradeTermsTDStyleRight">The unique user ID for the account chosen by the user at account registration.</td>
-    </tr>
-    <tr>
-    <td class="TradeTermsTDStyleLeft"> Volume</td><td class="TradeTermsTDStyleRight">The total number of shares traded for this stock.</td>
-    </tr>
-</table>
-<br />
-</td>
-</tr>
-</table>
-</form>
-</div>
-<!-------------------------------Start StockTrader Footer----------------------------------->
-<table class="FooterTableStyle">
-    <tr>
-            <td class="FooterLeftStyle">
-            Apache Stonehenge Incubator Project</td>
-            <td class="FooterRightStyle">
-            .NET StockTrader</td>
-    </tr>
-    <tr>
-            <td colspan="2" class="FooterCopyRightStyle"><br />
-            Created with Visual Studio and the Microsoft .NET Framework 3.5 
-            </td>
-    </tr>
-</table> 
-</table> 
-<table>
-<tr>
-    <td style="width:770px;height:500px">
-    </td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
+*/ %>
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+	<div class="main-title">
+		<h1>Glossary</h1>
+		<script type="text/javascript">
+		    var thisdate = new Date();
+		    document.writeln(thisdate.toLocaleString());
+		</script>
+	</div>
+	<table align="center" class="glossary" >
+		<thead>
+			<tr>
+				<th>Term</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td class="left">Account ID</td>
+				<td>A unique Integer based key. Each user is assigned an account ID at account creation time.</td>
+			</tr>
+			<tr>
+				<td class="left">Account Created</td>
+				<td>The time and date the users account was first created.</td>
+			</tr>
+			<tr>
+				<td class="left">Cash Balance</td>
+				<td>The current cash balance in the users account. This does not include current stock holdings.</td>
+			</tr>
+				<td class="left">Company</td>
+				<td>The full company name for an individual stock.</td>
+			<tr>
+				<td class="left">Current Gain/Loss</td>
+				<td>The total gain or loss of this account, computed by substracting the current sum of cash/holdings minus the opening account balance.</td>
+			</tr>
+				<td class="left">Current Price</td>
+				<td>The current trading price for a given stock symbol.</td>
+			<tr>
+				<td class="left">Gain/Loss</td>
+				<td>The current gain or loss of an individual stock holding, computed as (current market value - holding basis).</td>
+			</tr>
+			<tr>
+				<td class="left">Last Login</td>
+				<td>The date and time this user last logged in to Trade.</td>
+			</tr>
+			<tr>
+				<td class="left">Market Value</td>
+				<td>The current total value of a stock holding, computed as (quantity * current price).</td>
+			</tr>
+			<tr>
+				<td class="left">Number of Holdings</td>
+				<td>The total number of stocks currently owned by this account.</td>
+			</tr>
+			<tr>
+				<td class="left">Open Price</td>
+				<td>The price of a given stock at the open of the trading session.</td>
+			</tr>
+			<tr>
+				<td class="left">Order ID</td>
+				<td>A unique Integer based key. Each order is assigned an order ID at order creation time.</td>
+			</tr>
+			<tr>
+				<td class="left">Opening Balance</td>
+				<td>The initial cash balance in this account when it was opened.</td>
+			</tr>
+			<tr>
+				<td class="left">Order Status</td>
+				<td>orders are opened, processed, closed and completed. Order status shows the current stat for this order.</td>
+			</tr>
+			<tr>
+				<td class="left">Price Range</td>
+				<td>The low and high prices for this stock during the current trading session</td>
+			</tr>
+			<tr>
+				<td class="left">Purchase Date</td>
+				<td>The date and time the a stock was purchased.</td>
+			</tr>
+			<tr>
+				<td class="left">Purchase Price</td>
+				<td>The price used when purchasing the stock.</td>
+			</tr>
+			<tr>
+				<td class="left">Purchase Basis</td>
+				<td>The total cost to purchase this holding. This is computed as (quantity * purchase price).</td>
+			</tr>
+			<tr>
+				<td class="left">Quantity</td>
+				<td>The number of stock shares in the order or user holding.</td>
+			</tr>
+			<tr>
+				<td class="left">Session Created</td>
+				<td>An HTTP session is created for each user at during login. Session created shows the time and day when the session was created.</td>
+			</tr>
+			<tr>
+				<td class="left">Sum of Cash/Holdings</td>
+				<td>The total current value of this account. This is the sum of the cash balance along with the value of current stock holdings.</td>
+			</tr>
+			<tr>
+				<td class="left">Symbol</td>
+				<td>The symbol for a Trade stock.</td>
+			</tr>
+			<tr>
+				<td class="left">Total Logins</td>
+				<td>The total number of logins performed by this user.</td>
+			</tr>
+			<tr>
+				<td class="left">Total Logouts</td>
+				<td>The total number of logouts performed by this user.</td>
+			</tr>
+			<tr>
+				<td class="left">Total of Holdings</td>
+				<td>The current total value of all stock holdings in this account given the current valuation of each stock held.</td>
+			</tr>
+			<tr>
+				<td class="left">Top gainers</td>
+				<td>The list of stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) gaining the most in price during the current trading session.</td>
+			</tr>
+			<tr>
+				<td class="left">Top Losers</td>
+				<td>The list of stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) falling the most in price during the current trading session.</td>
+			</tr>
+			<tr>
+				<td class="left">Trader Stock Index (TSIA)</td>
+				<td>A computed index of the top 20 stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) in Trade.</td>
+			</tr>
+			<tr>
+				<td class="left">Trading Volume</td>
+				<td>The total number of shares traded for stocks (matching LIKE CLAUSE 's:1__%' per WebSphere Trade 6.1 behavior) during this trading session.</td>
+			</tr>
+			<tr>
+				<td class="left">Txn Fee</td>
+				<td>The fee charged by the brokerage to process this order.</td>
+			</tr>
+			<tr>
+				<td class="left">Type</td>
+				<td>The order type (buy or sell).</td>
+			</tr>
+			<tr>
+				<td class="left">User ID</td>
+				<td>The unique user ID for the account chosen by the user at account registration.</td>
+			</tr>
+			<tr>
+				<td class="left">Volume</td>
+				<td>The total number of shares traded for this stock.</td>
+			</tr>
+		</tbody>
+	</table>
+</asp:Content>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx.cs
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx.cs?rev=769572&r1=769571&r2=769572&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx.cs (original)
+++ incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Glossary.aspx.cs Tue Apr 28 22:20:50 2009
@@ -26,10 +26,7 @@
     public partial class Glossary : System.Web.UI.Page
     {
         protected void Page_Load(object sender, EventArgs e)
-        {
-            Date.Text = DateTime.Now.ToString("f");
-            //configlink.HRef = "http://" + HttpContext.Current.Server.MachineName + "/" + Settings.PAGE_PATH_CONFIG;
-           
+        {           
         }
     }
 }
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Images/red-arrow.gif
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Images/red-arrow.gif?rev=769572&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Images/red-arrow.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream