Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [12] WebPrototype
|
From: <m_h...@us...> - 2006-05-31 00:59:10
|
Revision: 12 Author: m_hildebrand Date: 2006-05-30 17:58:57 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=12&view=rev Log Message: ----------- Starting to add "real" data (it comes from a dummy DB) to some of the pages. Also starting to remove all tables for proper CSS usages Modified Paths: -------------- WebPrototype/ActionItem.aspx WebPrototype/App_Themes/Python/python.css WebPrototype/Assignments.aspx WebPrototype/Default.aspx WebPrototype/Default.aspx.cs WebPrototype/MasterPage.master WebPrototype/Web.config Modified: WebPrototype/ActionItem.aspx =================================================================== --- WebPrototype/ActionItem.aspx 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/ActionItem.aspx 2006-05-31 00:58:57 UTC (rev 12) @@ -1,7 +1,7 @@ <%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ActionItem.aspx.cs" Inherits="ActionItem" Title="Untitled Page" %> -<%@ Register Assembly="AtlasControlToolkit" Namespace="AtlasControlToolkit" TagPrefix="cc1" %> +<%@ Register Assembly="AtlasControlToolkit" Namespace="AtlasControlToolkit" TagPrefix="atlas" %> <asp:Content ID="Content1" ContentPlaceHolderID="PageContent" runat="Server"> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> @@ -14,14 +14,16 @@ Action Item</h2> </td> <td align="right" valign="bottom" style="padding-right: 20px;"> - <a href="#">Active</a> | - <asp:RadioButtonList ID="rdoAmountDone" runat="server" SkinID="rdoAmountDone"> - <asp:ListItem Selected="true" Text="0%" Value="0">0%</asp:ListItem> - <asp:ListItem Selected="true" Text="25%" Value="25">25%</asp:ListItem> - <asp:ListItem Selected="true" Text="50%" Value="50">50%</asp:ListItem> - <asp:ListItem Selected="true" Text="75%" Value="75">75%</asp:ListItem> - <asp:ListItem Selected="true" Text="100%" Value="100">100%</asp:ListItem> + <div class="radiolist"> + <a href="#">Active</a> | + <asp:RadioButtonList ID="rdoAmountDone" runat="server" SkinID="rdoAmountDone" RepeatDirection="Horizontal" CssClass="radiocontrol"> + <asp:ListItem Selected="true" Text="0%" Value="0">0%</asp:ListItem> + <asp:ListItem Selected="true" Text="25%" Value="25">25%</asp:ListItem> + <asp:ListItem Selected="true" Text="50%" Value="50">50%</asp:ListItem> + <asp:ListItem Selected="true" Text="75%" Value="75">75%</asp:ListItem> + <asp:ListItem Selected="true" Text="100%" Value="100">100%</asp:ListItem> </asp:RadioButtonList> + </div> </td> </tr> <tr> @@ -69,97 +71,58 @@ </table> </div> </td> - <td width="300px" align="right"> - <!--<iframe src="Notes.aspx" frameborder="0" width="100%" height="100%" scrolling="auto"></iframe>--> - <atlas:ScriptManager ID="ScriptManager1" runat="server" /> - <table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td width="100%"> - <b class="notetop"><b class="noteb1"></b><b class="noteb2"></b><b class="noteb3"></b> - <b class="noteb4"></b></b> - <div class="noteboxcontent"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <asp:Panel ID="Panel2" runat="server" CssClass="collapsePanelHeader"> - <td align="left" valign="bottom"> - <h4> - Don't Forget!:</h4> - 12 May 2006 - </td> - <td align="right" valign="bottom"> - <asp:Image ID="Image1" runat="server" ImageUrl="images/ArrowUp.gif" /> - <!--<asp:Image ID="Image2" runat="server" ImageUrl="images/ArrowDown.gif" />--> - <a href="#" class="notedelete">x</a></td> - </asp:Panel> - </tr> + <td width="300px" align="right" valign="top"> + <atlas:ScriptManager ID="ScriptManager1" runat="server" EnablePartialRendering="true" /> - </table> - <asp:Panel ID="Panel1" runat="server" Height="0"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td class="hr"> - <img alt="" src="images/spacer.gif" height="5" /><br /> - </td> - </tr> - </table> - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer fermentum laoreet - nunc. Maecenas consectetuer metus a justo. Donec semper. Proin tempor mauris non - arcu. Mauris nonummy convallis sapien. Aliquam erat volutpat. Ut eget ante a turpis - volutpat lobortis. Morbi accumsan justo eu massa. Nullam diam. Cras venenatis bibendum - diam. Suspendisse a erat tristique nunc consectetuer ultrices. - </asp:Panel> - </div> - <b class="notebottom"><b class="noteb4"></b><b class="noteb3"></b><b class="noteb2"> - </b></b> - </td></tr> + <table width="100%" cellpadding="0" cellspacing="0" border="0" style="padding: 10px;"> + <tr> + <td width="100%"> + <b class="notetop"><b class="noteb1"></b><b class="noteb2"></b><b class="noteb3"></b> + <b class="noteb4"></b></b> + <div class="noteboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <asp:Panel ID="Panel3" runat="server" CssClass="collapsePanelHeader"> + <td align="left" valign="bottom"> + <h4> + Reminder:</h4> + 15 Apr 2006 + </td> + <td align="right" valign="bottom"> + <img alt="Note2Arrow" src="App_Themes/Python/Images/ArrowUp.gif" id="Note2Arrow" /> + <a href="#" class="notedelete">x</a></td> + </asp:Panel> + </tr> + </table> + <atlas:CollapsiblePanelExtender ID="CollapsiblePanelExtender2" runat="server"> + <atlas:CollapsiblePanelProperties Collapsed="true" SuppressPostBack="true" CollapseControlID="Note2Arrow" + ExpandControlID="Note2Arrow" ExpandedImage="App_Themes/Python/Images/ArrowUp.gif" + CollapsedImage="App_Themes/Python/Images/ArrowDown.gif" TargetControlID="Note2Content" + AutoCollapse="false" AutoExpand="false" CollapsedSize="0" ImageControlID="Note2Arrow" /> + </atlas:CollapsiblePanelExtender> + <asp:Panel ID="Note2Content" runat="server" Height="0" Style="overflow: hidden; padding: 0px; + margin: 0px;"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + </table> + Integer lacus elit, consectetuer nec, rutrum at, pretium ac, risus. Sed semper massa + luctus mi. Donec placerat, diam vitae ultricies posuere, felis dui sollicitudin + nibh, eget blandit purus libero in elit. Aenean eget lectus eget ipsum rutrum scelerisque. + Nunc orci mauris, rhoncus ac, pellentesque sit amet, condimentum vel, nibh. Pellentesque + habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Suspendisse blandit. + </asp:Panel> + </div> + <b class="notebottom"><b class="noteb4"></b><b class="noteb3"></b><b class="noteb2"> + </b></b><b class="noteb1"></b> + </td> + </tr> </table> - <cc1:CollapsiblePanelExtender ID="CollapsiblePanelExtender1" runat="server"> - <cc1:CollapsiblePanelProperties Collapsed="true" SuppressPostBack="true" CollapseControlID="Image1" - ExpandControlID="Image1" ExpandedImage="images/ArrowUp.gif" CollapsedImage="images/ArrowUp.gif" - TargetControlID="Panel1" AutoCollapse="false" AutoExpand="false" CollapsedSize="0" - ImageControlID="Image1" /> - </cc1:CollapsiblePanelExtender> - <!-- - - - </asp:Panel> - --> - <div class="note"> - <div id="note1"> - </div> - <div id="note2"> - <b class="noteb1"></b> - <br /> - <b class="notetop"><b class="noteb1"></b><b class="noteb2"></b><b class="noteb3"></b> - <b class="noteb4"></b></b> - <div class="noteboxcontent"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td align="left" valign="bottom"> - <h4> - Reminder:</h4> - 01 Apr 2006 - </td> - <td align="right" valign="bottom"> - <a href="#" class="notedelete">x</a></td> - </tr> - <tr> - <td colspan="2" class="hr"> - <img alt="" src="images/spacer.gif" height="5" /><br /> - </td> - </tr> - </table> - Integer lacus elit, consectetuer nec, rutrum at, pretium ac, risus. Sed semper massa - luctus mi. Donec placerat, diam vitae ultricies posuere, felis dui sollicitudin - nibh, eget blandit purus libero in elit. Aenean eget lectus eget ipsum rutrum scelerisque. - Nunc orci mauris, rhoncus ac, pellentesque sit amet, condimentum vel, nibh. Pellentesque - habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Suspendisse blandit. - </div> - <b class="notebottom"><b class="noteb4"></b><b class="noteb3"></b><b class="noteb2"> - </b><b class="noteb1"></b></b> - </div> - <br /> - <a href="#" style="padding-left: 10px; text-align: right;">New Note</a> - </div> + <div style="padding-left: 10px; text-align: left;"><a href="#" style="padding-left: 10px; text-align: left;">New Note</a></div> </td> </tr> </table> Modified: WebPrototype/App_Themes/Python/python.css =================================================================== --- WebPrototype/App_Themes/Python/python.css 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/App_Themes/Python/python.css 2006-05-31 00:58:57 UTC (rev 12) @@ -16,40 +16,109 @@ { background-image: url(images/Header-Background.gif); background-repeat: repeat-x; - } -.logo + +#header A { - border: none; - padding-top: 7px; - padding-left: 10px; + color: White; } -TD.hr + +#header A:hover, #header A:active { - background-image: url(images/hrdot.gif); - background-repeat: repeat-x; - height: 1px; - margin: 4px 0px 2px 0px; - padding: 4px 0px 2px 0px; - background-position: center 4px; + color: #FDB928; } -#header TD + +#header #logo { - color: white; + background-position: left top; + left: 0px; + background-image: url(Images/TCDB-2006-Logo-on-Blue.gif); + width: 200px; + background-repeat: no-repeat; + position: absolute; + top: 4px; + left: 10px; + height: 50px; } -.username + +#header #menu { + text-align: right; + color: White; + padding-right: 10px; + padding-top: 5px; +} + +#header #menu .username +{ color: #FDB928; display: inline; } -#header A + +#header #menu #options { + border-top: red thin solid; + margin-top: 6px; + padding-top: 3px; + right: 0px; + text-align: right; + position: absolute; +} + +#header #menu #options #tasks +{ + text-align: right; color: White; + margin-left: 0px; + padding-left: 0px; + padding-right: 10px; + display: inline; } -#header A:hover, #header A:active + +#header #menu #options #build { - color: #FDB928; + text-align: left; + padding-right: 30px; + margin-right: 0px; + display: inline; + color: White; } + +.radiolist +{ + display: inline; + vertical-align: middle; + padding: 0px; + margin: 0px; + border-right: thin solid; + border-top: thin solid; + border-left: thin solid; + border-bottom: thin solid; +} + +.radiocontrol +{ + display: inline; +} + +TD.radiocontrol, INPUT.radiocontrol +{ + border: thin solid; +} + + +TD.hr +{ + background-image: url(images/hrdot.gif); + background-repeat: repeat-x; + height: 1px; + margin: 4px 0px 2px 0px; + padding: 4px 0px 2px 0px; + background-position: center 4px; +} + + + #footer A { color: White; @@ -61,6 +130,7 @@ #content { padding-left: 10px; + margin-top: 45px; } html Modified: WebPrototype/Assignments.aspx =================================================================== --- WebPrototype/Assignments.aspx 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/Assignments.aspx 2006-05-31 00:58:57 UTC (rev 12) @@ -11,7 +11,7 @@ My Assignments</h2> </td> <td align="right" valign="bottom" style="padding-right: 20px;"> - <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" /></td> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" AutoPostBack="true" /></td> </tr> <tr> <td colspan="2"> @@ -20,7 +20,33 @@ </b></b> <div class="xboxcontent"> <div id="MyAssignmentsData"> - <table> + <asp:GridView ID="GridView1" runat="server" GridLines="None" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataSourceID="DummyObjectDataSource1"> + <Columns> + <asp:CommandField ShowSelectButton="True" /> + <asp:BoundField DataField="Date" HeaderText="Date" SortExpression="Date" /> + <asp:BoundField DataField="Type" HeaderText="Type" SortExpression="Type" /> + <asp:BoundField DataField="Assignment" HeaderText="Assignment" SortExpression="Assignment" /> + <asp:BoundField DataField="Status" HeaderText="Status" SortExpression="Status" /> + <asp:BoundField DataField="% Complete" HeaderText="% Complete" SortExpression="% Complete" /> + <asp:BoundField DataField="Total" HeaderText="Total" SortExpression="Total" /> + <asp:BoundField DataField="Pass Rate" HeaderText="Pass Rate" SortExpression="Pass Rate" /> + <asp:BoundField DataField="Pass" HeaderText="Pass" SortExpression="Pass" /> + <asp:BoundField DataField="Fail" HeaderText="Fail" SortExpression="Fail" /> + <asp:BoundField DataField="Error" HeaderText="Error" SortExpression="Error" /> + <asp:BoundField DataField="id" HeaderText="id" InsertVisible="False" ReadOnly="True" + SortExpression="id" /> + <asp:CheckBoxField DataField="completed" HeaderText="completed" SortExpression="completed" + Visible="False" /> + </Columns> + </asp:GridView> + <asp:ObjectDataSource ID="DummyObjectDataSource1" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="DummyGetAssignmentData" TypeName="DummyDataSetTableAdapters.AssignmentsTableAdapter"> + <SelectParameters> + <asp:ControlParameter ControlID="cboShowCompleted" DefaultValue="false" Name="IsCompleted" + PropertyName="Checked" Type="Boolean" /> + </SelectParameters> + </asp:ObjectDataSource> + <!--<table> <tr> <td style="text-align: left; width: 60px;"> <a href="#">Date</a></td> @@ -93,7 +119,7 @@ <td> 1</td> </tr> - </table> + </table>--> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> Modified: WebPrototype/Default.aspx =================================================================== --- WebPrototype/Default.aspx 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/Default.aspx 2006-05-31 00:58:57 UTC (rev 12) @@ -1,5 +1,6 @@ <%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="Assignments" Title="TCDB: Home" %> <asp:Content ID="Content1" ContentPlaceHolderID="PageContent" Runat="Server"> + <asp:Button ID="btnSave" runat="server" Text="Save!" OnClick="btnSave_Click" /> </asp:Content> Modified: WebPrototype/Default.aspx.cs =================================================================== --- WebPrototype/Default.aspx.cs 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/Default.aspx.cs 2006-05-31 00:58:57 UTC (rev 12) @@ -15,4 +15,8 @@ { } + protected void btnSave_Click(object sender, EventArgs e) + { + btnSave.Text = "I've been saved!"; + } } Modified: WebPrototype/MasterPage.master =================================================================== --- WebPrototype/MasterPage.master 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/MasterPage.master 2006-05-31 00:58:57 UTC (rev 12) @@ -7,46 +7,31 @@ <body class="master"> <div id="nonFooter"> <div id="header"> - <table border="0" cellpadding="0" cellspacing="0" width="100%"> - <tr> - <td align="left" valign="top"> - <a href="Default.aspx"><img src="App_Themes/Python/Images/TCDB-2006-Logo-on-Blue.gif" alt="Logo" class="logo" style="padding-top: 4px; padding-left: 10px" /></a></td> - <td align="right" style="padding-right: 10px" width="500" valign="middle"> - <table border="0" cellpadding="0" cellspacing="0" width="100%"> - <tr> - <td colspan="2" align="right"> - Welcome - <div class="username"> - <asp:Label ID="lblWelcome" runat="server"></asp:Label></div> - | - <asp:LoginView ID="MenuLoginView" runat="server"> - <AnonymousTemplate> - <a href="Register.aspx" class="header">Register</a> | <a href="Login.aspx" class="header"> - Login</a></AnonymousTemplate> - <LoggedInTemplate> - <a href="Settings.aspx" class="header">Settings</a> | <a href="Admin.aspx" class="header"> - Admin</a> | <a href="Logout.aspx" class="header">Logout</a></LoggedInTemplate> - </asp:LoginView> - </td> - </tr> - <tr> - <td colspan="2" class="hr"> - <img alt="" src="images/spacer.gif" height="1" /><br /> - </td> - </tr> - <tr> - <td align="left"> - VSM | 1.1 | Alpha | 134</td> - <td align="right"> - <a href="Assignments.aspx" class="header">Assignments</a> | <a href="Execution.aspx" - class="header">Execution</a> | <a href="Management.aspx" class="header">Test Management</a></td> - </tr> - </table> - </td> - </tr> - </table> + <div id="logo"> + </div> + <div id="menu"> + Welcome + <div class="username"> + <asp:Label ID="lblWelcome" runat="server"></asp:Label></div> + | + <asp:LoginView ID="MenuLoginView" runat="server"> + <AnonymousTemplate> + <a href="Register.aspx" class="header">Register</a> | <a href="Login.aspx" class="header"> + Login</a></AnonymousTemplate> + <LoggedInTemplate> + <a href="Settings.aspx" class="header">Settings</a> | <a href="Admin.aspx" class="header"> + Admin</a> | <a href="Logout.aspx" class="header">Logout</a></LoggedInTemplate> + </asp:LoginView> + <div id="options"> + <div id="build"> + VSM | 1.1 | Alpha | 134</div> + <div id="tasks"> + <a href="Assignments.aspx" class="header">Assignments</a> | <a href="Execution.aspx" + class="header">Execution</a> | <a href="Management.aspx" class="header">Test Management</a> + </div> + </div> + </div> </div> - <br /> <div id="content" class="fullheight"> <form id="form1" runat="server"> <asp:SiteMapPath ID="SiteMapPath1" runat="server"> Modified: WebPrototype/Web.config =================================================================== --- WebPrototype/Web.config 2006-05-30 23:55:42 UTC (rev 11) +++ WebPrototype/Web.config 2006-05-31 00:58:57 UTC (rev 12) @@ -44,7 +44,10 @@ --> </microsoft.web> <appSettings/> - <connectionStrings/> + <connectionStrings> + <add name="DummyDatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database.mdf;Integrated Security=True;User Instance=True" + providerName="System.Data.SqlClient" /> + </connectionStrings> <system.web> <pages theme="Python" styleSheetTheme="Python"> <controls> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
