Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [118] Website
|
From: <m_h...@us...> - 2006-07-13 03:41:30
|
Revision: 118 Author: m_hildebrand Date: 2006-07-12 20:41:21 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=118&view=rev Log Message: ----------- Continued work on making action items look pretty. they're ready to be used, but can definately still use a lot of TLC. Modified Paths: -------------- Website/App_Code/TCDB_Users.cs Website/App_Themes/Python/python.css Website/Bin/App_Licenses.dll Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/Includes/Authenticate.ascx Website/web.config Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-13 00:02:32 UTC (rev 117) +++ Website/App_Code/TCDB_Users.cs 2006-07-13 03:41:21 UTC (rev 118) @@ -341,9 +341,15 @@ public bool HasRight(string right, int productID) { // TODO: Implement this function! - return false; + return true; } + public static bool HasRight(string userID, string right, int productID) + { + // TODO: Implement this function! + return true; + } + public List<TCDB_Right> GetRights(bool reload) { // TODO: If rights == null Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-13 00:02:32 UTC (rev 117) +++ Website/App_Themes/Python/python.css 2006-07-13 03:41:21 UTC (rev 118) @@ -357,6 +357,10 @@ /********** END Box Content **********/ /********** BEGIN Global Classes **********/ +.priority_high, .priority_normal +{ + display: inline; +} .priority_high:after { @@ -387,4 +391,10 @@ { border-bottom: solid thin red; margin: 5px; +} + +label +{ + font-weight: bold; + margin-right: 5px; } \ No newline at end of file Modified: Website/Bin/App_Licenses.dll =================================================================== (Binary files differ) Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/ActionItems.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -200,20 +200,23 @@ </div> <div class="right"> <div class="buttons"> - Percent Complete:<asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" - AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" - SelectedValue='<%# Bind("percentComplete") %>' CssClass="buttons"> - <asp:ListItem>0</asp:ListItem> - <asp:ListItem>25</asp:ListItem> - <asp:ListItem>50</asp:ListItem> - <asp:ListItem>75</asp:ListItem> - <asp:ListItem>100</asp:ListItem> - </asp:RadioButtonList></div> + <label> + Percent Complete:</label><asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" + AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" + SelectedValue='<%# Bind("percentComplete") %>' CssClass="buttons"> + <asp:ListItem>0</asp:ListItem> + <asp:ListItem>25</asp:ListItem> + <asp:ListItem>50</asp:ListItem> + <asp:ListItem>75</asp:ListItem> + <asp:ListItem>100</asp:ListItem> + </asp:RadioButtonList></div> <div class="status"> - Status:<asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" - DataSourceID="StatusDataSource" DataTextField="statusName" DataValueField="statusID" - AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>'> - </asp:DropDownList> + <label> + Status:</label><asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" + OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" DataSourceID="StatusDataSource" + DataTextField="statusName" DataValueField="statusID" AppendDataBoundItems="True" + SelectedValue='<%# Bind("statusID") %>'> + </asp:DropDownList> </div> </div> <div class="bottom"> @@ -228,22 +231,21 @@ <div class="xboxcontent"> <div class="aiTop"> <div class="left"> - <!-- TODO: change how priority is working here! --> - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Eval("highPriority") %>' - Enabled="False" /> + <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' + Text='<div class="priority_high"></div>'></asp:Literal> <h2> <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> - <h3> - Test Pass:</h3> - <asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> + <br /> + <label> + Test Pass:</label><asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> </div> <div class="right"> - Assigned: - <asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> - Due: - <asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue") %>'></asp:Label><br /> - Finished: - <asp:Label ID="dateFinishedLbl" runat="server" Text='<%# Eval("dateFinished") %>'></asp:Label> + <label> + Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + <label> + Due:</label><asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue") %>'></asp:Label><br /> + <label> + Finished:</label><asp:Label ID="dateFinishedLbl" runat="server" Text='<%# Eval("dateFinished") %>'></asp:Label> </div> <div class="bottom"> </div> @@ -251,142 +253,176 @@ </div> </div> <div class="aiMiddle"> - <strong>Description:</strong><br /> + <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="left"> + <br /> <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="Delete" Text="Delete" /> </div> <div class="right"> - Created By: - <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" Text='<%# Eval("createdBy") %>'></asp:Label><br /> - Assigned To: <asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" - Text='<%# Eval("assigned") %>'></asp:Label> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" + Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <label> + Assigned To:</label><asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" + Text='<%# Eval("assigned") %>'></asp:Label> </div> <div class="bottom"> </div> </div> - <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> - </b></b> </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> </div> </ItemTemplate> <EditItemTemplate> - <table width="700" border="1"> - <tr> - <td colspan="2" width="55%" align="left" valign="top"> - <strong>Name: </strong><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' - Width="70%" /> - <br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> - </asp:DropDownList></td> - <td align="right" colspan="2" width="45%"> - <strong>Assigned: - <asp:Label ID="dateAssignedLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateAssigned") %>'></asp:Label></strong><br /> - <strong>Due: </strong> - <!-- <cc1:DatePicker ID="dueDate" run at="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> --> - <br /> - <strong>Finished: </strong> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="4"> - <strong>Description:</strong><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="2" width="60%" align="left"> - <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" - Text="Update"> - </asp:LinkButton> | - <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"> - </asp:LinkButton> - </td> - <td align="right" colspan="2" width="%40"> - <strong>Created By:</strong> - <asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> - <strong>Assigned To:</strong> - <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" - DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList><br /> - </td> - </tr> - </table> + <div id="aiContent"> + <div class="xsnazzy"> + <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="left"> + <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' + Text='<div class="priority_high"></div>'></asp:Literal> + <label> + Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Width="70%" /> + <br /> + <label> + High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + <label> + Test Pass:</label><asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList> + </div> + <div class="right"> + <label> + Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Font-Bold="False" + Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + <label> + Due:</label><!-- TODO: date picker goes here --><br /> + <label> + Finished:</label><!-- TODO: date picker goes here --> + </div> + <div class="bottom"> + </div> + <div class="hr"> + </div> + </div> + <div class="aiMiddle"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + <div class="hr"> + </div> + </div> + <div class="aiBottom"> + <div class="left"> + <br /> + <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" + Text="Update"> + </asp:LinkButton> | + <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"> + </asp:LinkButton> + </div> + <div class="right"> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <label> + Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" + DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> + </asp:DropDownList> + </div> + <div class="bottom"> + </div> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </div> </EditItemTemplate> <InsertItemTemplate> - <table width="700" border="1"> - <tr> - <td colspan="2" width="55%" align="left" valign="top"> - <strong>Name:</strong> - <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="70%" /><br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> - </asp:DropDownList> - <td align="right" colspan="2" width="45%"> - <strong>Assigned: </strong> - <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> - <strong>Due: </strong> - <!-- <cc1:DatePicker ID="dueDate" run at="server" DateFormatString="MM/dd/yyyy" /><br /> --> - <strong>Finished: </strong></td> - </tr> - <tr> - <td colspan="4" class="hr" style="height: 22px"> - </td> - </tr> - <tr> - <td colspan="4"> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="2" width="60%" align="left"> - <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> - </td> - <td align="right" colspan="2" width="40%"> - <strong>Created By: <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" - Text="Label"></asp:Label></strong><br /> - <strong>Assigned To: <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" - SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList></strong> - </td> - </tr> - </table> + <div id="aiContent"> + <div class="xsnazzy"> + <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="left"> + <label> + Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Width="70%" /> + <br /> + <label> + High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + <label> + Test Pass:</label> + <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList> + </div> + <div class="right"> + <label> + Assigned:</label> + <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> + <label> + Due:</label><!-- TODO: date picker goes here --><br /> + <label> + Finished:</label><!-- TODO: date picker goes here --> + </div> + <div class="bottom"> + </div> + <div class="hr"> + </div> + </div> + <div class="aiMiddle"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + <div class="hr"> + </div> + </div> + <div class="aiBottom"> + <div class="left"> + <br /> + <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> + </div> + <div class="right"> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" + Text="Label"></asp:Label><br /> + <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="bottom"> + </div> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </div> </InsertItemTemplate> </asp:FormView> </div> Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/Assignments.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -23,16 +23,16 @@ */ if (id == null) { - /* - if (User.IsInRole("Admin")) + if (g_user.HasRight(TCDB_Constant.RIGHTS_SITEADMIN, 0)) { - AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; - AssignmentDataSource.SelectParameters.Clear(); + // Admin user should get everything, so don't set any values! + + //AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; + //AssignmentDataSource.SelectParameters.Clear(); + } else - */ - // TODO: uncomment this line! - id = g_user.ID.ToString(); + id = g_user.ID.ToString(); } Session.Add("id", id); } @@ -56,9 +56,9 @@ // Set priority image bool priority = Convert.ToBoolean(data["highPriority"].ToString()); if (priority) + gRow.Cells[0].Text = "<div class=\"priority_high\" />"; + else gRow.Cells[0].Text = "<div class=\"priority_normal\" />"; - else - gRow.Cells[0].Text = "<div class=\"priority_high\" />"; // Set Hyperlink URL String id = data["childID"].ToString(); Modified: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/Authenticate.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -76,7 +76,8 @@ { // We have a valid user who is already in the DB FormsAuthentication.SetAuthCookie(LoginUser.UserName, LoginUser.RememberMeSet); - Response.Redirect(FormsAuthentication.GetRedirectUrl(LoginUser.UserName, LoginUser.RememberMeSet)); + Response.Redirect(Request.RawUrl); + //Response.Redirect(FormsAuthentication.GetRedirectUrl(LoginUser.UserName, LoginUser.RememberMeSet)); } else { Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-13 00:02:32 UTC (rev 117) +++ Website/web.config 2006-07-13 03:41:21 UTC (rev 118) @@ -45,7 +45,7 @@ </microsoft.web> <appSettings/> <connectionStrings> - <add name="tcdbConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=3600" providerName="System.Data.SqlClient"/> + <add name="tcdbConnectionString" connectionString="Data Source=dad.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=30" providerName="System.Data.SqlClient"/> </connectionStrings> <system.web> <authentication mode="Forms"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
