Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [111] Website
|
From: <m_h...@us...> - 2006-07-12 18:50:55
|
Revision: 111 Author: m_hildebrand Date: 2006-07-12 11:50:48 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=111&view=rev Log Message: ----------- Almost finished applying theme info to the assignments page. It still could use a little TLC though. Filters are disabled. Modified Paths: -------------- Website/App_Themes/Python/python.css Website/Includes/Assignments.ascx Website/Includes/Authenticate.ascx Website/Includes/Header_User.ascx Website/web.config Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-12 18:06:58 UTC (rev 110) +++ Website/App_Themes/Python/python.css 2006-07-12 18:50:48 UTC (rev 111) @@ -67,6 +67,12 @@ { padding-right: 30px; } + +.username +{ + color: #FDB928; + display: inline; +} /********** END Header Content **********/ /********** BEGIN Login Content **********/ @@ -93,20 +99,22 @@ #TreeContent { float: left; - border: solid thin red; + /* border: solid thin red; */ padding-right: 10px; } #MainContent { overflow: hidden; - border: solid thin green; + /* border: solid thin green; */ + max-width: 75%; + min-width: 25%; } #NotesContent { float: right; - border: solid thin blue; + /* border: solid thin blue; */ } @@ -119,17 +127,45 @@ background-color: #eee; } -#Assignments h2 +#Assignments #AssignmentsHeader { + padding-top: 15px; + display: block; + /* border: solid thin black; */ +} + +#AssignmentsHeader h2 +{ display: inline; - border: solid thin red; + left: 0px; + padding-left: 15px; + margin-bottom: 0px; + padding-bottom: 0px; + /* border: solid thin blue; */ } -#Assignments quickFilter +#AssignmentsHeader .buttons { - border: solid thick blue; + display: inline; + padding: auto 10px auto 50px; + margin: auto 10px auto 50px; } +#AssignmentsHeader .quickFilter +{ + display: inline; + right: 0px; + padding-right: 15px; + /* border: solid thin red; */ + position: relative; +} + +.quickFilter input +{ + position: relative; + top: 3px; +} + /********** END Assignments Content **********/ /********** BEGIN Footer Content **********/ @@ -256,5 +292,11 @@ border: 0 solid #08c; border-width: 0 1px; padding: 0px 5px 0px 5px; -} +} /********** END Box Content **********/ + +.priority_high:after +{ + content: " (!) "; + color: red; +} Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Assignments.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -30,10 +30,9 @@ AssignmentDataSource.SelectParameters.Clear(); } else - id = Profile.userID; */ // TODO: uncomment this line! - //id = g_user.ID.ToString(); + id = g_user.ID.ToString(); } Session.Add("id", id); } @@ -356,12 +355,19 @@ </SelectParameters> </asp:ObjectDataSource> <div id="Assignments"> - <h2> - My Assignments</h2> - <div id="quickFilter"> + <div id="AssignmentsHeader"> + <h2> + My Assignments</h2> + <div class="buttons"> + <asp:LinkButton ID="newActionItem" runat="server" PostBackUrl="~/ActionItem.aspx?mode=new">New Action Item</asp:LinkButton> + + <asp:LinkButton ID="newWorkOrder" runat="server" PostBackUrl="~/WorkOrder.aspx?mode=new">New Work Order</asp:LinkButton> </div> - <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" - AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + <div class="quickFilter"> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + </div> + </div> <div class="xsnazzy"> <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> @@ -412,7 +418,6 @@ <asp:BoundField DataField="WOError" HeaderText="# Error" ReadOnly="true" SortExpression="error"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> - </Columns> </asp:GridView> @@ -420,9 +425,6 @@ <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </div> - <asp:LinkButton ID="newActionItem" runat="server" PostBackUrl="~/ActionItem.aspx?mode=new">New Action Item</asp:LinkButton> - - <asp:LinkButton ID="newWorkOrder" runat="server" PostBackUrl="~/WorkOrder.aspx?mode=new">New Work Order</asp:LinkButton> <!-- <tr> <td> Modified: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Authenticate.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -110,7 +110,7 @@ // TODO: after implementing the commented out section, default admin = null TCDB_User admin = product.QALEAD; - /* + // TODO: What happens if there is more than one user with this right? if (product.QALEAD.HasRight(TCDB_Constant.RIGHTS_ASSIGNPERMISSION, product.ID)) { @@ -122,12 +122,12 @@ } else { - admin = TCDB_Config.GetAdmin(); + // TODO: uncomment this after TCDB_Config is implemented + // admin = TCDB_Config.GetAdmin(); } - */ + // Send an action item - TCDB_ActionItem ai = new TCDB_ActionItem(0, TCDB_Constant.USER_AI_NAME + newUser.FIRSTNAME, TCDB_Constant.USER_AI_DESCRIPTION + newUser.FULLNAME, newUser, admin, 0); if (!TCDB_ActionItemDB.TCDB_SaveActionItem(ai)) Modified: Website/Includes/Header_User.ascx =================================================================== --- Website/Includes/Header_User.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Header_User.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -13,4 +13,4 @@ } </script> -Welcome <asp:LoginName ID="LoginName" runat="server" /> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" />) | Settings | Admin \ No newline at end of file +Welcome <div class="username"><%= g_user.FULLNAME %></div> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" />) | Settings | Admin \ No newline at end of file Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-12 18:06:58 UTC (rev 110) +++ Website/web.config 2006-07-12 18:50:48 UTC (rev 111) @@ -45,7 +45,7 @@ </microsoft.web> <appSettings/> <connectionStrings> - <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=60" providerName="System.Data.SqlClient"/> + <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=3600" 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. |
