Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [231] Website/Includes
|
From: <m_h...@us...> - 2006-07-28 20:56:12
|
Revision: 231 Author: m_hildebrand Date: 2006-07-28 09:44:32 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=231&view=rev Log Message: ----------- Continued progress on cleaning up CSS. Including a fix to make the calendars look nice now Modified Paths: -------------- Website/App_Themes/Python/python.css Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/Includes/Header_User.ascx Website/Includes/UserSettings.ascx Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-27 22:51:17 UTC (rev 230) +++ Website/App_Themes/Python/python.css 2006-07-28 16:44:32 UTC (rev 231) @@ -1,10 +1,10 @@ /********** BEGIN Global Classes **********/ -html +HTML { height: 100%; } -body +BODY { height: 100%; margin: 0; @@ -29,7 +29,7 @@ color: blue; } -label +LABEL { font-weight: bold; margin-right: 5px; @@ -65,6 +65,19 @@ clear: both; } +.bottom +{ + position: absolute; + bottom: 0; + left: 0; +} + +* HTML .bottom +{ + position: static; + padding-top: 8px; +} + .hover:hover, TR.overdue:hover, TR.finished:hover { background-color: #eee; @@ -82,7 +95,28 @@ /********** END Global Classes **********/ +/********** BEGIN Calendar Classes **********/ +.calendar +{ + display: inline; + margin: 5px 0 5px 0; +} +.calendar LABEL +{ + font-weight: normal; +} + +.calendar IMG +{ + position: relative !important; + top: 6px !important; + padding-left: 5px !important; + margin: 0 0 3px 0 !important; +} +/********** END Calendar Classes ************/ + + /********** BEGIN Header Content **********/ #HeaderContent { @@ -165,14 +199,14 @@ /* A CSS hack that only applied to IE -- forces the height of NonFooter to be 100%, something that causes problems in Mozilla */ -* html #NonFooter +* HTML #NonFooter { height: 100%; } #FooterContent { - background-color: #022e66; + background-color: #022e66; color: white; padding: 6px 0 6px 0; vertical-align: middle; @@ -184,7 +218,7 @@ /* A CSS hack that only applies to IE -- specifies a different height for the footer and set the position to static so the background displays */ /* TODO: Figure out a way to keep the footer in IE from overlaping page content */ -* html #FooterContent +* HTML #FooterContent { position: static; margin-top: -2.3em; @@ -203,33 +237,33 @@ color: Red; } -.form label, .form A, .form input, .form select +.form LABEL, .form A, .form INPUT, .form SELECT { display: block; float: left; margin-bottom: 5px; } -.form label, .form A +.form LABEL, .form A { text-align: right; width: 110px; padding-right: 5px; } -.form input +.form INPUT { width: 150px; } -.form input, .form select +.form INPUT, .form SELECT { position: relative; top: -4px; text-align: left; } -.form .checkbox>input +.form .checkbox > INPUT { width: inherit; display: inline; @@ -238,12 +272,12 @@ left: -3px; } -* html .form .checkbox input +* HTML .form .checkbox INPUT { width: 15px; } -.form br +.form BR { clear: left; } @@ -355,13 +389,14 @@ display: block; } -.ch h2, #Filters h2 +.ch H2, #Filters H2 { display: inline; - left: 0px; + left: 0; + top: 0; padding-left: 15px; - margin-bottom: 0px; - padding-bottom: 0px; + margin-bottom: 0; + padding-bottom: 0; } .ch .buttons @@ -374,18 +409,55 @@ .ch .quickFilter { display: inline; - right: 0px; + right: 0; padding-right: 15px; position: relative; } -.ch .quickFilter input +.ch .quickFilter INPUT { position: relative; top: 3px; } /********* END Content Header ***********/ +/********* BEGIN Content Content ***********/ +.ct, .cb +{ + position: relative; +} + +* html .cb +{ + position: static; +} + +.ct .bottom +{ + bottom: 5px; +} + +* html .cb .bottom +{ + position: relative; + top: 5px; +} + +.ct H2 +{ + display: block; + left: 0px; + margin: 0px; + padding: 0px; + font-size: 16px; +} + +* html .ct H2 +{ + font-size: 16px; +} +/********* END Content Top ************/ + /********** BEGIN Assignments Content **********/ TD.colAssignment { @@ -412,7 +484,7 @@ padding-right: 15px; /*position: relative; */ } -.ch .status input +.ch .status INPUT { position: relative; top: 3px; @@ -432,7 +504,7 @@ display: inline; } -.filters .xboxcontent .right input +.filters .xboxcontent .right INPUT { position: relative; top: -3px; Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-27 22:51:17 UTC (rev 230) +++ Website/Includes/ActionItems.ascx 2006-07-28 16:44:32 UTC (rev 231) @@ -57,60 +57,68 @@ <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> <div class="xboxcontent"> - <div class="aiTop"> - <div class="ct"> - <div class="left"> + <div class="ct"> + <div class="left"> + <div class="top"> <h2> <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' - Text='<div class="priority_high">(!)</div>'></asp:Literal> - <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> + Text='<div class="priority_high"></div>'></asp:Literal> + <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> </div> - <div class="right"> + <div class="bottom"> <label> - Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned", "{0:d}") %>'></asp:Label><br /> + Test Pass:</label><asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> + </div> + </div> + <div class="right"> + <div class="item"> <label> - Due:</label><asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue", "{0:d}") %>'></asp:Label><br /> + Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned", "{0:d}") %>'></asp:Label> + </div> + <div class="item"> <label> + Due:</label><asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue", "{0:d}") %>'></asp:Label> + </div> + <div class="item"> + <label> Finished:</label><asp:Label ID="dateFinished" runat="server" Text='<%# Eval("dateFinished", "{0:d}") %>'></asp:Label> </div> - <div class="end"> - </div> - <div class="hr"> - </div> </div> + <div class="end"> + </div> + <div class="hr"> + </div> </div> - <div class="aiMiddle"> - <div class="cm"> - <label> - Test Pass:</label><asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label><br /> - <label> - Description:</label><br /> - <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> - </cm> - <div class="hr"> - </div> + <div class="cm"> + <label> + Description:</label><br /> + <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> + <div class="hr"> </div> </div> - <div class="aiBottom"> - <div class="cb"> - <div class="left"> - <br /> + <div class="cb"> + <div class="left"> + <div class="bottom"> <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" Text="New" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" /> | <asp:LinkButton ID="DeleteButton" runat="server" CausesValidation="False" CommandName="deleteItem" Text="Delete" OnCommand="deleteItem" /> </div> - <div class="right"> + </div> + <div class="right"> + <div class="item"> <label> Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" - Text='<%# Eval("createdBy") %>'></asp:Label><br /> + Text='<%# Eval("createdBy") %>'></asp:Label> + </div> + <div class="item"> <label> Assigned To:</label><asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" Text='<%# Eval("assigned") %>'></asp:Label> </div> - <div class="end"> - </div> </div> + <div class="end"> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -123,80 +131,87 @@ <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> <div class="xboxcontent"> - <div class="aiTop"> - <div class="ct"> - <div class="left"> - <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' - Text='<div class="priority_high"></div>'></asp:Literal> + <div class="ct"> + <div class="left"> + <div class="item"> <label> - Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Name:</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="500px" /> - <br /> + </div> + <div class="item"> <label> - High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> + High Priority:</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" CssClass="checkbox" /> + </div> + <div class="item"> <label> Test Pass:</label><asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True" DataSourceID="TestPassDataSource" DataTextField="name" DataValueField="testPassID" SelectedValue='<%# Bind("testPassID") %>'> <asp:ListItem Value="0" Selected="True"><none></asp:ListItem> - </asp:DropDownList> + </asp:DropDownList> </div> - <div class="right"> + </div> + <div class="right"> + <div class="item"> <label> Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Font-Bold="False" - Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + Text='<%# Eval("dateAssigned") %>'></asp:Label> + </div> + <div class="item"> <label> - Due:</label><ew:CalendarPopup ID="dateDue" runat="server" PopupLocation="Left" ShowGoToToday="True" + Due:</label><div class="calendar"><ew:CalendarPopup ID="dateDue" runat="server" PopupLocation="Left" ShowGoToToday="True" ControlDisplay="LabelImage" ImageUrl="../App_Themes/Python/Images/calendar.gif" SelectedDate='<%# Bind("dateDue") %>' UpperBoundDate="12/31/9999 23:59:59" VisibleDate="2006-07-21"> - </ew:CalendarPopup> - <br /> + </ew:CalendarPopup></div> + </div> + <div class="item"> <label> - Finished:</label><ew:CalendarPopup ID="dateFinished" runat="server" PopupLocation="Left" + Finished:</label><div class="calendar"><ew:CalendarPopup ID="dateFinished" runat="server" PopupLocation="Left" ShowClearDate="true" ShowGoToToday="True" NullableLabelText="Select a date" ControlDisplay="LabelImage" ImageUrl="../App_Themes/Python/Images/calendar.gif" Nullable="True" OnDateChanged="dateFinished_DateChanged" SelectedDate="" UpperBoundDate="12/31/9999 23:59:59" VisibleDate="" AutoPostBack="True"> - </ew:CalendarPopup> + </ew:CalendarPopup></div> </div> - <div class="end"> - </div> - <div class="hr"> - </div> </div> + <div class="end"> + </div> + <div class="hr"> + </div> </div> - <div class="aiMiddle"> - <div class="cm"> - <label> - Description:</label><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="300" Width="100%" /> - <div class="hr"> - </div> + <div class="cm"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="300" Width="100%" /> + <div class="hr"> </div> </div> - <div class="aiBottom"> - <div class="cb"> - <div class="left"> - <br /> + <div class="cb"> + <div class="left"> + <div class="bottom"> <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" Text="Update"> - </asp:LinkButton> | + </asp:LinkButton> | <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel"> </asp:LinkButton> </div> - <div class="right"> + </div> + <div class="right"> + <div class="item"> <label> - Created By:</label><asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label> + </div> + <div class="item"> <label> Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> </asp:DropDownList> </div> - <div class="end"> - </div> </div> + <div class="end"> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -210,71 +225,74 @@ <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> <div class="xboxcontent"> - <div class="aiTop"> - <div class="ct"> - <div class="left"> + <div class="ct"> + <div class="left"> + <div class="item"> <label> - Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Name:</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="500px" /> - <br /> + </div> + <div class="item"> <label> - High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> + High Priority:</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /></div> + <div class="item"> <label> Test Pass:</label> <asp:DropDownList ID="testPassList" runat="server" AppendDataBoundItems="True" DataSourceID="TestPassDataSource" DataTextField="name" DataValueField="testPassID" SelectedValue='<%# Bind("testPassID") %>'> <asp:ListItem Value="0" Selected="True"><none></asp:ListItem> - </asp:DropDownList> - </div> - <div class="right"> + </asp:DropDownList></div> + </div> + <div class="right"> + <div class="item"> <label> Assigned:</label> - <asp:Label ID="dateAssignedLbl" runat="server"></asp:Label><br /> + <asp:Label ID="dateAssignedLbl" runat="server"></asp:Label> + </div> + <div class="item"> <label> - Due:</label><ew:CalendarPopup ID="dateDue" runat="server" PopupLocation="Left" ShowGoToToday="True" + Due:</label><div class="calendar"><ew:CalendarPopup ID="dateDue" runat="server" PopupLocation="Left" ShowGoToToday="True" ControlDisplay="LabelImage" ImageUrl="../App_Themes/Python/Images/calendar.gif" SelectedDate='<%# Bind("dateDue") %>' UpperBoundDate="12/31/9999 23:59:59" VisibleDate="2006-07-21"> - </ew:CalendarPopup> + </ew:CalendarPopup></div> </div> - <div class="end"> - </div> - <div class="hr"> - </div> </div> - </div> - <div class="aiMiddle"> - <div class="cm"> - <label> - Description:</label><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="300" Width="100%" /> + <div class="end"> </div> <div class="hr"> </div> </div> - <div class="aiBottom"> - <div class="cb"> - <div class="left"> - <br /> + <div class="cm"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="300" Width="100%" /> + <div class="hr"> + </div> + </div> + <div class="cb"> + <div class="left"> + <div class="bottom"> <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" - Text="Insert"></asp:LinkButton> | - <asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"></asp:LinkButton> + Text="Insert"></asp:LinkButton> | <asp:LinkButton ID="InsertCancelButton" + runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel"></asp:LinkButton> </div> - <div class="right"> + </div> + <div class="right"> + <div class="item"> <label> Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" - ToolTip='<%# Bind("creatorID") %>'></asp:Label><br /> + ToolTip='<%# Bind("creatorID") %>'></asp:Label></div> + <div class="item"> <label> Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList> - </div> - <div class="end"> - </div> + </asp:DropDownList></div> </div> + <div class="end"> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -326,5 +344,4 @@ <SelectParameters> <asp:Parameter Name="testPassID" Type="Int32" /> </SelectParameters> -</asp:ObjectDataSource> - \ No newline at end of file +</asp:ObjectDataSource> \ No newline at end of file Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-27 22:51:17 UTC (rev 230) +++ Website/Includes/Assignments.ascx 2006-07-28 16:44:32 UTC (rev 231) @@ -151,17 +151,24 @@ </div> </div> <div class="cm"> - From: - <ew:CalendarPopup ID="fromDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SelectedDate="2006-01-01" AutoPostBack="true" OnDateChanged="update" - SkinID="calendar" PostedDate="1/1/2006" VisibleDate="2006-01-01" OnInit="fromDate_Init"> - </ew:CalendarPopup> - <br /> - To: - <ew:CalendarPopup ID="toDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="1/1/3000 12:00:00 AM" - AutoPostBack="true" OnDateChanged="update" OnInit="toDate_Init"> - </ew:CalendarPopup> + <div class="item"> + <label> + From:</label><div class="calendar"> + <ew:CalendarPopup ID="fromDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SelectedDate="2006-01-01" AutoPostBack="true" OnDateChanged="update" + SkinID="calendar" PostedDate="1/1/2006" VisibleDate="2006-01-01" OnInit="fromDate_Init"> + </ew:CalendarPopup> + </div> + </div> + <div class="item"> + <label> + To:</label><div class="calendar"> + <ew:CalendarPopup ID="toDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="1/1/3000 12:00:00 AM" + AutoPostBack="true" OnDateChanged="update" OnInit="toDate_Init"> + </ew:CalendarPopup> + </div> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -185,17 +192,24 @@ </div> </div> <div class="cm"> - From: - <ew:CalendarPopup ID="fromDueDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="2006-01-01" AutoPostBack="true" - OnDateChanged="update" OnInit="fromDueDate_Init"> - </ew:CalendarPopup> - <br /> - To: - <ew:CalendarPopup ID="toDueDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="1/1/3000 12:00:00 AM" - AutoPostBack="true" OnDateChanged="update" OnInit="toDueDate_Init"> - </ew:CalendarPopup> + <div class="item"> + <label> + From:</label><div class="calendar"> + <ew:CalendarPopup ID="fromDueDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="2006-01-01" AutoPostBack="true" + OnDateChanged="update" OnInit="fromDueDate_Init"> + </ew:CalendarPopup> + </div> + </div> + <div class="item"> + <label> + To:</label><div class="calendar"> + <ew:CalendarPopup ID="toDueDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="1/1/3000 12:00:00 AM" + AutoPostBack="true" OnDateChanged="update" OnInit="toDueDate_Init"> + </ew:CalendarPopup> + </div> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -218,17 +232,24 @@ </div> </div> <div class="cm"> - From: - <ew:CalendarPopup ID="fromFinishedDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="2006-01-01" AutoPostBack="true" - OnDateChanged="update" OnInit="fromFinishedDate_Init"> - </ew:CalendarPopup> - <br /> - To: - <ew:CalendarPopup ID="toFinishedDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" - ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="3000-01-01" AutoPostBack="true" - OnDateChanged="update" OnInit="toFinishedDate_Init"> - </ew:CalendarPopup> + <div class="item"> + <label> + From:</label><div class="calendar"> + <ew:CalendarPopup ID="fromFinishedDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="2006-01-01" AutoPostBack="true" + OnDateChanged="update" OnInit="fromFinishedDate_Init"> + </ew:CalendarPopup> + </div> + </div> + <div class="item"> + <label> + To:</label><div class="calendar"> + <ew:CalendarPopup ID="toFinishedDate" runat="server" PopupLocation="Bottom" ShowGoToToday="True" + ControlDisplay="LabelImage" SkinID="calendar" SelectedDate="3000-01-01" AutoPostBack="true" + OnDateChanged="update" OnInit="toFinishedDate_Init"> + </ew:CalendarPopup> + </div> + </div> </div> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> @@ -254,10 +275,12 @@ </div> <div class="cm"> <div class="alignmiddle"> - <asp:CheckBox ID="cboShowActionItems" runat="server" Checked="true" AutoPostBack="True" - OnCheckedChanged="update" OnInit="cboShowActionItems_Init" />Action Items<br /> - <asp:CheckBox ID="cboShowWorkOrders" runat="server" Checked="true" AutoPostBack="True" - OnCheckedChanged="update" OnInit="cboShowWorkOrders_Init" />Work Orders + <div class="item"> + <asp:CheckBox ID="cboShowActionItems" runat="server" Checked="true" AutoPostBack="True" + OnCheckedChanged="update" OnInit="cboShowActionItems_Init" />Action Items</div> + <div class="item"> + <asp:CheckBox ID="cboShowWorkOrders" runat="server" Checked="true" AutoPostBack="True" + OnCheckedChanged="update" OnInit="cboShowWorkOrders_Init" />Work Orders</div> </div> </div> </div> @@ -283,10 +306,12 @@ </div> <div class="cm"> <div class="alignmiddle"> - <asp:CheckBox ID="cboHighPriority" runat="server" Checked="True" OnCheckedChanged="update" - AutoPostBack="True" OnInit="cboHighPriority_Init" />High<br /> - <asp:CheckBox ID="cboLowPriority" runat="server" Checked="true" OnCheckedChanged="update" - AutoPostBack="True" OnInit="cboLowPriority_Init" />Low + <div class="item"> + <asp:CheckBox ID="cboHighPriority" runat="server" Checked="True" OnCheckedChanged="update" + AutoPostBack="True" OnInit="cboHighPriority_Init" />High</div> + <div class="item"> + <asp:CheckBox ID="cboLowPriority" runat="server" Checked="true" OnCheckedChanged="update" + AutoPostBack="True" OnInit="cboLowPriority_Init" />Low</div> </div> </div> </div> Modified: Website/Includes/Header_User.ascx =================================================================== --- Website/Includes/Header_User.ascx 2006-07-27 22:51:17 UTC (rev 230) +++ Website/Includes/Header_User.ascx 2006-07-28 16:44:32 UTC (rev 231) @@ -1,8 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="Header_User.ascx.cs" Inherits="Header_User" %> <%@ Import Namespace="TCDB.Common" %> -Welcome <div class="username"><%= m_user.FIRSTNAME %> <%= m_user.LASTNAME %></div> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" CssClass="username" />) | <a -href="UserSettings.aspx?mode=read&<%= Constants.CODE_USER %>=<%= m_user.ID %>" >Settings</a> +Welcome <div class="username"><%= m_user.FIRSTNAME %> <%= m_user.LASTNAME %></div> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" CssClass="username" />) | <a +href="UserSettings.aspx?mode=read&<%= Constants.CODE_USER %>=<%= m_user.ID %>" >Settings</a> <% if (m_user.HasRight(Constants.RIGHTS_SITEADMIN, Constants.PRODUCT_SITEID)) { %> | <a href="Administration.aspx">Admin</a> Modified: Website/Includes/UserSettings.ascx =================================================================== --- Website/Includes/UserSettings.ascx 2006-07-27 22:51:17 UTC (rev 230) +++ Website/Includes/UserSettings.ascx 2006-07-28 16:44:32 UTC (rev 231) @@ -37,6 +37,12 @@ Email:</label> <asp:Label ID="emailLabel" runat="server" Text='<%# Eval("email") %>'></asp:Label> </div> + <div class="item"> + <label> + Automation:</label> + <asp:CheckBox ID="automationCheckBox" runat="server" Checked='<%# Eval("automation") %>' + Enabled="false" /> + </div> </div> <div class="end"> </div> @@ -84,12 +90,6 @@ </asp:ObjectDataSource> </div> - <div class="item"> - <label> - Automation:</label> - <asp:CheckBox ID="automationCheckBox" runat="server" Checked='<%# Eval("automation") %>' - Enabled="false" /> - </div> </div> <div class="end"> </div> @@ -140,6 +140,11 @@ Email:</label> <asp:TextBox ID="emailBox" runat="server" Text='<%# Bind("email") %>'></asp:TextBox> </div> + <div class="item"> + <label> + Automation:</label> + <asp:CheckBox ID="automationBox" runat="server" Checked='<%# Bind("automation") %>' Enabled="true" /> + </div> </div> <div class="end"> </div> @@ -181,11 +186,6 @@ </asp:DropDownList><br /> <asp:ListBox ID="roleList" runat="server" DataSourceID="RolesDataSource" DataTextField="roleName" DataValueField="roleID" OnDataBound="roleList_DataBound" OnSelectedIndexChanged="roleList_SelectedIndexChanged" AutoPostBack="True" SelectionMode="Multiple"></asp:ListBox> </div> - <div class="item"> - <label> - Automation:</label> - <asp:CheckBox ID="automationBox" runat="server" Checked='<%# Bind("automation") %>' Enabled="true" /> - </div> </div> <div class="end"> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
