Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [263] Deploy
|
From: <m_h...@us...> - 2006-08-02 20:47:37
|
Revision: 263 Author: m_hildebrand Date: 2006-08-02 13:47:22 -0700 (Wed, 02 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=263&view=rev Log Message: ----------- Split CSS into non-ie and ie Fixed an infinite loop when loading assignments tree Modified Paths: -------------- Deploy/TCDB_Setup/TCDB_Setup.vdproj Website/App_Code/Common.cs Website/App_Code/Users.cs Website/App_Themes/Python/python.css Website/Includes/ActionItems.ascx Website/TCDB.master Website/web.config Added Paths: ----------- Website/App_Themes/Python/style-ie.css Property Changed: ---------------- Deploy/ Property changes on: Deploy ___________________________________________________________________ Name: svn:ignore - *.suo TCDB_2006.msi setup.exe TCDB_2006 1.0.0 Alpha 2.msi + *.suo TCDB_2006.msi setup.exe TCDB_2006 1.0.0 Alpha 2.msi TCDB_2006 1.0.0 Alpha 2b.msi Modified: Deploy/TCDB_Setup/TCDB_Setup.vdproj =================================================================== --- Deploy/TCDB_Setup/TCDB_Setup.vdproj 2006-08-02 19:34:53 UTC (rev 262) +++ Deploy/TCDB_Setup/TCDB_Setup.vdproj 2006-08-02 20:47:22 UTC (rev 263) @@ -15,6 +15,12 @@ { "Entry" { + "MsmKey" = "8:_0FCE56EE20B73158098A3151A021A74C" + "OwnerKey" = "8:_E626D31751034819989DCB478ACFFA92" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1BF98782D91A87389FFA1ABF5936867C" "OwnerKey" = "8:_E626D31751034819989DCB478ACFFA92" "MsmSig" = "8:_UNDEFINED" @@ -40,13 +46,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1BF98782D91A87389FFA1ABF5936867C" + "OwnerKey" = "8:_E626D31751034819989DCB478ACFFA92" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E626D31751034819989DCB478ACFFA92" + "OwnerKey" = "8:_0FCE56EE20B73158098A3151A021A74C" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -55,6 +61,12 @@ "OwnerKey" = "8:_5CDC7F185F72143DAE7DD65D0A7F7B6F" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1BF98782D91A87389FFA1ABF5936867C" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -159,6 +171,37 @@ } "File" { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0FCE56EE20B73158098A3151A021A74C" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:FreeTextBox, Version=3.1.6.34851, Culture=neutral, PublicKeyToken=5962a4e684a48b87, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0FCE56EE20B73158098A3151A021A74C" + { + "Name" = "8:FreeTextBox.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:FreeTextBox.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_115F2933414A473086CFB664233245A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1BF98782D91A87389FFA1ABF5936867C" { "AssemblyRegister" = "3:1" @@ -352,14 +395,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:TestCase Database 2006 (TCDB)" - "ProductCode" = "8:{FE2928BD-E347-4480-9E37-291076A6026B}" - "PackageCode" = "8:{B59BEFA1-13F2-468F-B59B-FC638C68C6FC}" + "ProductCode" = "8:{0930EAAB-C6DB-48B5-8BD8-E07095607859}" + "PackageCode" = "8:{65EAF903-713C-40F0-82B5-6205D9898B64}" "UpgradeCode" = "8:{0409CEE2-45EA-431A-802D-EFA205FB1A48}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.1.1" + "ProductVersion" = "8:1.0.0" "Manufacturer" = "8:Quest Software" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -368,7 +411,7 @@ "ARPCONTACT" = "8:Quest Software" "Keywords" = "8:" "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:http://tcdb.sf.net" + "ARPURLINFOABOUT" = "8:http://opentcdb.org" "ARPPRODUCTICON" = "8:" "ARPIconIndex" = "3:0" "SearchPath" = "8:" Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-08-02 19:34:53 UTC (rev 262) +++ Website/App_Code/Common.cs 2006-08-02 20:47:22 UTC (rev 263) @@ -1266,7 +1266,7 @@ public static int ASSIGNMENT_UNFINISHED = 0; public static int ASSIGNMENT_NEW = 3; - public static string TCDB_VERSION = "1.0.0 Alpha 2"; + public static string TCDB_VERSION = "1.0.0 Alpha 2b"; public static bool IS_DEV_ENV = false; public static string RIGHTS_ASSIGNPERMISSION = "assignPermission"; Modified: Website/App_Code/Users.cs =================================================================== --- Website/App_Code/Users.cs 2006-08-02 19:34:53 UTC (rev 262) +++ Website/App_Code/Users.cs 2006-08-02 20:47:22 UTC (rev 263) @@ -338,12 +338,13 @@ // Problem: I think that it was caused because creating an anon user calls this, // which in turn creates an anon user. // Solution: Only calling this if we're not dealing with the anon user. - if (user.ID == Constants.ANONYMOUSUSERID) + if (user.ID != Constants.ANONYMOUSUSERID) { // Anything that we have to Get based on userID should happen // in this block so that we avoid an infinate loop - p_assignments = user.GetAssignments(false, Constants.ASSIGNMENT_FINISHEDANDUNFINISHED); + //p_assignments = user.GetAssignments(false, Constants.ASSIGNMENT_FINISHEDANDUNFINISHED); } + p_assignments = null; p_rights = new Dictionary<int, List<String>>(); } @@ -515,8 +516,9 @@ // TODO: This list needs to be able to reflect filters! if (p_assignments == null || reload) { - p_assignments = AssignmentDB.GetAssignmentList(null,statusFilter, ID, null); + p_assignments = AssignmentDB.GetAssignmentList(null, statusFilter, ID, null); } + return p_assignments; } Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-08-02 19:34:53 UTC (rev 262) +++ Website/App_Themes/Python/python.css 2006-08-02 20:47:22 UTC (rev 263) @@ -72,12 +72,6 @@ left: 0; } -* HTML .bottom -{ - position: static; - padding-top: 8px; -} - .hover:hover, TR.overdue:hover, TR.finished:hover { background-color: #eee; @@ -102,11 +96,6 @@ top: 1px; } -* html .item .checkbox INPUT -{ - position: static; -} - .item UL { margin: 0; @@ -285,13 +274,6 @@ overflow: auto; } -/* A CSS hack that only applied to IE -- forces the height of NonFooter - to be 100%, something that causes problems in Mozilla */ -* HTML #NonFooter -{ - height: 100%; -} - #FooterContent { background-color: #022e66; @@ -303,14 +285,6 @@ margin: -2.35em auto 0 auto; } -/* 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 -{ - position: static; - margin-top: -2.3em; -} /********** END Footer Content **********/ /********** BEGIN Form Content **********/ @@ -360,11 +334,6 @@ left: -3px; } -* HTML .form .checkbox INPUT -{ - width: 15px; -} - .form BR { clear: left; @@ -382,11 +351,6 @@ width: 100px; } -* html #fullname input -{ - width: 100px; -} - #email input { width: 200px; @@ -513,8 +477,10 @@ .ch .buttons { display: inline; - padding: auto 10px auto 50px; - margin: auto 10px auto 50px; + padding-left: 10px; + padding-right: 50px; + margin-left: 10px; + margin-right: 50px; } .ch .quickFilter @@ -538,22 +504,11 @@ position: relative; } -* html .cb -{ - position: static; -} - .ct .bottom { bottom: 5px; } -* html .cb .bottom -{ - position: relative; - top: 5px; -} - .ct H2 { display: block; @@ -562,11 +517,6 @@ padding: 0px; font-size: 16px; } - -* html .ct H2 -{ - font-size: 16px; -} /********* END Content Top ************/ /********** BEGIN Assignments Content **********/ Added: Website/App_Themes/Python/style-ie.css =================================================================== --- Website/App_Themes/Python/style-ie.css (rev 0) +++ Website/App_Themes/Python/style-ie.css 2006-08-02 20:47:22 UTC (rev 263) @@ -0,0 +1,53 @@ + +.bottom +{ + position: static; + padding-top: 8px; +} + +.item .checkbox INPUT +{ + position: static; +} + +/* A CSS hack that only applied to IE -- forces the height of NonFooter + to be 100%, something that causes problems in Mozilla */ +#NonFooter +{ + height: 100%; +} + +/* 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 */ +#FooterContent +{ + position: static; + margin-top: -2.3em; +} + +.form .checkbox INPUT +{ + width: 15px; +} + +#fullname input +{ + width: 100px; +} + +.cb +{ + position: static; +} + +.cb .bottom +{ + position: relative; + top: 5px; +} + +.ct H2 +{ + font-size: 16px; +} \ No newline at end of file Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-02 19:34:53 UTC (rev 262) +++ Website/Includes/ActionItems.ascx 2006-08-02 20:47:22 UTC (rev 263) @@ -7,9 +7,10 @@ <%@ Import Namespace="System.Data.SqlClient" %> <%@ Import Namespace="eWorld" %> <div id="ActionItem"> - <asp:FormView ID="ActionItemsView" runat="server" DataSourceID="ActionItemDataSource" DataKeyNames="actionItemID" - CellPadding="4" ForeColor="#333333" OnDataBound="ActionItemsView_DataBound" OnItemCommand="ActionItemsView_ItemCommand" - Width="100%" OnItemInserted="ActionItemsView_ItemInserted" OnItemUpdated="ActionItemsView_ItemUpdated"> + <asp:FormView ID="ActionItemsView" runat="server" DataSourceID="ActionItemDataSource" + DataKeyNames="actionItemID" CellPadding="4" ForeColor="#333333" OnDataBound="ActionItemsView_DataBound" + OnItemCommand="ActionItemsView_ItemCommand" Width="100%" OnItemInserted="ActionItemsView_ItemInserted" + OnItemUpdated="ActionItemsView_ItemUpdated"> <HeaderTemplate> <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_statusTableAdapter"> @@ -31,7 +32,8 @@ <label> Status:</label><asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="statusChanged" DataSourceID="StatusDataSource" DataTextField="statusName" - DataValueField="statusID" AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>' OnInit="statusList_Init"> + DataValueField="statusID" AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>' + OnInit="statusList_Init"> </asp:DropDownList> </div> <div class="buttons"> @@ -62,7 +64,7 @@ <div class="top"> <h2> <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' - Text='<div class="priority_high_large"> </div>'></asp:Literal> + Text='<span class="priority_high_large"> </span>'></asp:Literal> <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> </div> <div class="bottom"> @@ -100,9 +102,10 @@ <div class="left"> <div class="bottom"> <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" - Text="New" OnInit="NewButton_Init" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" - CommandName="Edit" Text="Edit" OnInit="EditButton_Init" /> | <asp:LinkButton ID="DeleteButton" runat="server" - CausesValidation="False" CommandName="deleteItem" Text="Delete" OnCommand="deleteItem" OnInit="DeleteButton_Init" /> + Text="New" OnInit="NewButton_Init" /> | <asp:LinkButton ID="EditButton" + runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" OnInit="EditButton_Init" /> | <asp:LinkButton + ID="DeleteButton" runat="server" CausesValidation="False" CommandName="deleteItem" + Text="Delete" OnCommand="deleteItem" OnInit="DeleteButton_Init" /> </div> </div> <div class="right"> @@ -124,6 +127,7 @@ <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </div> + </div> </ItemTemplate> <EditItemTemplate> <div id="aiContent"> @@ -160,18 +164,23 @@ </div> <div class="item"> <label> - 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></div> + 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> + </div> </div> <div class="item"> <label> - 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" OnInit="dateFinished_Init"> - </ew:CalendarPopup></div> + 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" + OnInit="dateFinished_Init"> + </ew:CalendarPopup> + </div> </div> </div> <div class="end"> @@ -206,7 +215,8 @@ <div class="item"> <label> Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>' OnDataBound="assignedTo_DataBound"> + DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>' + OnDataBound="assignedTo_DataBound"> </asp:DropDownList> </div> </div> @@ -252,10 +262,12 @@ </div> <div class="item"> <label> - 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></div> + 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> + </div> </div> </div> <div class="end"> @@ -344,4 +356,4 @@ <SelectParameters> <asp:Parameter Name="testPassID" Type="Int32" /> </SelectParameters> -</asp:ObjectDataSource> \ No newline at end of file +</asp:ObjectDataSource> Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-08-02 19:34:53 UTC (rev 262) +++ Website/TCDB.master 2006-08-02 20:47:22 UTC (rev 263) @@ -16,6 +16,9 @@ <head runat="server"> <title>TCDB: Test Case DataBase 2006</title> </head> +<!--[it lt IE 8]> + <link href="App_Themes/<%= Page.StyleSheetTheme %>/style-ie.css" type="text/css" rel="stylesheet" /> +<![endif]--> <body> <div id="NonFooter"> <% if (ConfigDB.GetConfigString("tcdb_version").Equals(Constants.TCDB_VERSION)) Modified: Website/web.config =================================================================== --- Website/web.config 2006-08-02 19:34:53 UTC (rev 262) +++ Website/web.config 2006-08-02 20:47:22 UTC (rev 263) @@ -128,7 +128,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=60" + <add name="tcdbConnectionString" connectionString="Data Source=tcdb.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect Timeout=60" providerName="System.Data.SqlClient" /> </connectionStrings> <system.web> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
