|
From: <tmy...@us...> - 2006-07-11 12:25:10
|
Revision: 57 Author: tmyroadctfig Date: 2006-07-11 05:24:16 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/nmailserver/?rev=57&view=rev Log Message: ----------- Converted webpages to use a standard theme. Added the start of a configuration wizard. Modified Paths: -------------- NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolEnvelope.cs NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolRecipient.cs NMail/branches/luke-dev/NMail.Administration.Web/CreateFolder.aspx NMail/branches/luke-dev/NMail.Administration.Web/CreateMailDomain.aspx NMail/branches/luke-dev/NMail.Administration.Web/CreateUser.aspx NMail/branches/luke-dev/NMail.Administration.Web/FolderDetails.aspx NMail/branches/luke-dev/NMail.Administration.Web/Images/Tango/Thumbs.db NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master NMail/branches/luke-dev/NMail.Administration.Web/SetPasswordPanel.ascx NMail/branches/luke-dev/NMail.Administration.Web/SpoolDetails.aspx NMail/branches/luke-dev/NMail.Administration.Web/TaskList.ascx NMail/branches/luke-dev/NMail.Administration.Web/UserDetails.aspx NMail/branches/luke-dev/NMail.Administration.Web/ViewFolders.aspx NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx NMail/branches/luke-dev/NMail.Administration.Web/ViewUsers.aspx NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap NMail/branches/luke-dev/NMail.Administration.Web/web.config NMail/branches/luke-dev/NMail.Server.Console/NMail.config NMail/branches/luke-dev/NMail.SpoolData.MySql/MySqlSpoolData.cs NMail/branches/luke-dev/NMail.sln Added Paths: ----------- NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/ NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/ NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/Default.skin NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/StyleSheet.css NMail/branches/luke-dev/NMail.SetupWizard/ NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.cs NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.resx NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.cs NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.resx NMail/branches/luke-dev/NMail.SetupWizard/DnsConfigPanel.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/DnsConfigPanel.cs NMail/branches/luke-dev/NMail.SetupWizard/DnsConfigPanel.resx NMail/branches/luke-dev/NMail.SetupWizard/NMail.SetupWizard.csproj NMail/branches/luke-dev/NMail.SetupWizard/Program.cs NMail/branches/luke-dev/NMail.SetupWizard/Properties/ NMail/branches/luke-dev/NMail.SetupWizard/Properties/AssemblyInfo.cs NMail/branches/luke-dev/NMail.SetupWizard/Properties/Resources.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/Properties/Resources.resx NMail/branches/luke-dev/NMail.SetupWizard/Properties/Settings.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/Properties/Settings.settings NMail/branches/luke-dev/NMail.SetupWizard/SmtpSubSysConfigPanel.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/SmtpSubSysConfigPanel.cs NMail/branches/luke-dev/NMail.SetupWizard/SmtpSubSysConfigPanel.resx NMail/branches/luke-dev/NMail.SetupWizard/WelcomePanel.Designer.cs NMail/branches/luke-dev/NMail.SetupWizard/WelcomePanel.cs NMail/branches/luke-dev/NMail.SetupWizard/WelcomePanel.resx Removed Paths: ------------- NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css Modified: NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolEnvelope.cs =================================================================== --- NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolEnvelope.cs 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolEnvelope.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -25,6 +25,7 @@ /// <summary> /// The envelope for a message in the spool. /// </summary> + [Serializable] public class SpoolEnvelope : Envelope { /// <summary> /// Creates a new spool envelope. Modified: NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolRecipient.cs =================================================================== --- NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolRecipient.cs 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail/DataTypes/Spool/SpoolRecipient.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -6,6 +6,7 @@ /// <summary> /// Holds the details of a message recipient that is waiting delivery. /// </summary> + [Serializable] public class SpoolRecipient { /// <summary> /// Creates a new spool recipient. Added: NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/Default.skin =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/Default.skin (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/Default.skin 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,25 @@ +<asp:SiteMapPath runat="server" Font-Size="smaller" /> + +<asp:LoginStatus runat="server" Font-Size="smaller" /> + +<asp:DetailsView runat="server" CellPadding="4" ForeColor="#333333" GridLines="None"> + <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> + <EditRowStyle BackColor="#2461BF" /> + <RowStyle BackColor="#EFF3FB" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <AlternatingRowStyle BackColor="White" /> +</asp:DetailsView> + +<asp:GridView runat="server" CellPadding="4" ForeColor="#333333" GridLines="None"> + <EditRowStyle BackColor="#2461BF" /> + <RowStyle BackColor="#EFF3FB" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> + <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <AlternatingRowStyle BackColor="White" /> +</asp:GridView> \ No newline at end of file Added: NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/StyleSheet.css =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/StyleSheet.css (rev 0) +++ NMail/branches/luke-dev/NMail.Administration.Web/App_Themes/Default/StyleSheet.css 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,69 @@ +body +{ + font-family: Sans-Serif; +} + +.title +{ + font-size: 24pt; + color: white; + font-family: Tahoma, Arial, Sans-Serif; + padding: 0px; + margin: 0px; +} + +.title-nmail +{ + font-weight: bold; + font-style: italic; + font-size: 24pt; + color: white; + font-family: Tahoma, Arial, Sans-Serif; + padding: 0px; + margin: 0px; +} + +.title-box +{ + background-color: #123785; + border-top: black thin solid; + border-bottom: black thin solid; + padding: 0.5em; +} + +.status-box +{ + background-color: #666666; + border-bottom: black thin solid; + padding-left: 0.5em; + padding-right: 0.5em; +} + +.side-bar +{ + background-color: #999999; + border-right: black thin solid; + vertical-align: top; + height: 100%; + padding: 0.5em +} + +.header-style +{ + background-color: #507CD1; + font-weight: bold; + color: white; + padding: 4px; +} + +.row-style +{ + background-color: #EFF3FB; + padding: 4px; +} + +.alternating-row-style +{ + background-color: white; + padding: 4px; +} \ No newline at end of file Modified: NMail/branches/luke-dev/NMail.Administration.Web/CreateFolder.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/CreateFolder.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/CreateFolder.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,21 +1,13 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateFolder.aspx.cs" Inherits="CreateFolder" Title="Untitled Page" %> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateFolder.aspx.cs" Inherits="CreateFolder" Title="NMail Administration - Create Folder" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" runat="server" Visible="false" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> - <h2>Create New Folder</h2> - <asp:DetailsView ID="FolderDetailsView" runat="server" AutoGenerateRows="False" CellPadding="4" - ForeColor="#333333" GridLines="None" DefaultMode="Insert" DataSourceID="CreateFolderDataSource" AutoGenerateInsertButton="True" OnModeChanging="FolderDetailsView_ModeChanging"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <h1>Create New Folder</h1> + <asp:DetailsView ID="FolderDetailsView" runat="server" AutoGenerateRows="False" + DefaultMode="Insert" DataSourceID="CreateFolderDataSource" AutoGenerateInsertButton="True" OnModeChanging="FolderDetailsView_ModeChanging"> <Fields> <asp:BoundField DataField="FolderName" HeaderText="Folder Name" SortExpression="FolderName" /> </Fields> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> </asp:DetailsView> <asp:ObjectDataSource ID="CreateFolderDataSource" runat="server" InsertMethod="CreateFolder" OnInserted="FolderDataSource_Inserted" OnInserting="FolderDataSource_Inserting" Modified: NMail/branches/luke-dev/NMail.Administration.Web/CreateMailDomain.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/CreateMailDomain.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/CreateMailDomain.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,17 +1,9 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateMailDomain.aspx.cs" Inherits="CreateMailDomain" Title="Untitled Page" %> -<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateMailDomain.aspx.cs" Inherits="CreateMailDomain" Title="NMail Administration - Create Mail Domain" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" Visible="false" runat="server" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> - <h2>Create New Mail Domain</h2> - <asp:DetailsView ID="MailDomainDetailsView" runat="server" CellPadding="4" ForeColor="#333333" GridLines="None" AutoGenerateRows="False" DefaultMode="Insert" DataMember=" " OnItemInserting="MailDomainDetailsView_ItemInserting" OnModeChanging="MailDomainDetailsView_ModeChanging"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> + <h1>Create New Mail Domain</h1> + <asp:DetailsView ID="MailDomainDetailsView" runat="server" AutoGenerateRows="False" DefaultMode="Insert" DataMember=" " OnItemInserting="MailDomainDetailsView_ItemInserting" OnModeChanging="MailDomainDetailsView_ModeChanging"> <Fields> <asp:TemplateField HeaderText="Primary Host" SortExpression="PrimaryHost"> <InsertItemTemplate> Modified: NMail/branches/luke-dev/NMail.Administration.Web/CreateUser.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/CreateUser.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/CreateUser.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,25 +1,17 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateUser.aspx.cs" Inherits="CreateUser" Title="Untitled Page" %> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="CreateUser.aspx.cs" Inherits="CreateUser" Title="NMail Administration - Create User" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" runat="server" Visible="false" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> - <h2>Create user</h2> - <asp:DetailsView ID="UserDetailsView" runat="server" AutoGenerateRows="False" CellPadding="4" - DataSourceID="CreateUserDataSource" DefaultMode="Insert" ForeColor="#333333" - GridLines="None" OnModeChanging="UserDetailsView_ModeChanging"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <h1>Create user</h1> + <asp:DetailsView ID="UserDetailsView" runat="server" AutoGenerateRows="False" + DataSourceID="CreateUserDataSource" DefaultMode="Insert" + OnModeChanging="UserDetailsView_ModeChanging"> <Fields> <asp:BoundField DataField="Username" HeaderText="Username" SortExpression="Username" /> <asp:BoundField DataField="QuotaWarnLimit" HeaderText="Warn Quota" SortExpression="QuotaWarnLimit" /> <asp:BoundField DataField="QuotaHardLimit" HeaderText="Hard Quota" SortExpression="QuotaHardLimit" /> <asp:CommandField ShowInsertButton="True" /> </Fields> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> </asp:DetailsView> <asp:ObjectDataSource ID="CreateUserDataSource" runat="server" InsertMethod="CreateUesr" OnInserted="CreateUserDataSource_Inserted" OnInserting="CreateUserDataSource_Inserting" @@ -31,4 +23,3 @@ </InsertParameters> </asp:ObjectDataSource> </asp:Content> - Modified: NMail/branches/luke-dev/NMail.Administration.Web/FolderDetails.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/FolderDetails.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/FolderDetails.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,5 +1,5 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="FolderDetails.aspx.cs" Inherits="FolderDetails" Title="Untitled Page" %> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="FolderDetails.aspx.cs" Inherits="FolderDetails" Title="NMail Administration - Folder Details" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" runat="server" Visible="false" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> @@ -13,13 +13,8 @@ </asp:Panel> <asp:Panel ID="MainPanel" runat="server"> - <h2>Folder Details</h2> - <asp:DetailsView ID="FolderDetailsView" runat="server" AutoGenerateRows="False" CellPadding="4" DataSourceID="FolderDataSource" ForeColor="#333333" GridLines="None" OnItemDeleting="FolderDetailsView_ItemDeleting"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <h1>Folder Details</h1> + <asp:DetailsView ID="FolderDetailsView" runat="server" AutoGenerateRows="False" DataSourceID="FolderDataSource" OnItemDeleting="FolderDetailsView_ItemDeleting"> <Fields> <asp:BoundField DataField="FolderId" HeaderText="Folder Id" SortExpression="FolderId" InsertVisible="False" ReadOnly="True" /> <asp:HyperLinkField DataNavigateUrlFields="ParentId" DataNavigateUrlFormatString="FolderDetails.aspx?FolderId={0}" @@ -29,9 +24,6 @@ <asp:CheckBoxField DataField="HasChildren" HeaderText="Has Children" SortExpression="HasChildren" InsertVisible="False" ReadOnly="True" /> <asp:CommandField ShowDeleteButton="True" /> </Fields> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> </asp:DetailsView> <asp:ObjectDataSource ID="FolderDataSource" runat="server" SelectMethod="GetFolder" TypeName="NMail.Administration.Web.FolderDataSource" DeleteMethod="DeleteFolder" OnDeleted="FolderDataSource_Deleted" OnDeleting="FolderDataSource_Deleting" InsertMethod="CreateFolder"> @@ -46,10 +38,8 @@ </InsertParameters> </asp:ObjectDataSource> - <h2>Sub-folders</h2> - <asp:GridView ID="SubFoldersGridView" runat="server" AutoGenerateColumns="False" CellPadding="4" - DataSourceID="FolderChildrenDataSource" ForeColor="#333333" GridLines="None"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <h1>Sub-folders</h1> + <asp:GridView ID="SubFoldersGridView" runat="server" AutoGenerateColumns="False" DataSourceID="FolderChildrenDataSource"> <Columns> <asp:BoundField DataField="FolderId" HeaderText="Folder Id" SortExpression="FolderId" /> <asp:BoundField DataField="FolderName" HeaderText="Folder Name" ReadOnly="True" SortExpression="FolderName" /> @@ -58,12 +48,6 @@ <asp:HyperLinkField DataNavigateUrlFields="FolderId" DataNavigateUrlFormatString="FolderDetails.aspx?FolderId={0}" HeaderText="Details" Text="details" /> </Columns> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> <EmptyDataTemplate> This folder has no subfolders.<br /> </EmptyDataTemplate> @@ -78,15 +62,8 @@ <asp:Image ID="AclStatusImage" runat="server" Visible="false" /> <asp:Label ID="AclStatusLabel" runat="server"></asp:Label> - <h2>Folder ACL</h2> - <asp:GridView ID="AclGridView" runat="server" CellPadding="4" ForeColor="#333333" GridLines="None" AutoGenerateColumns="False" DataSourceID="FolderAclDataSource" ShowFooter="True" DataKeyNames="Identifier"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> + <h1>Folder ACL</h1> + <asp:GridView ID="AclGridView" runat="server" AutoGenerateColumns="False" DataSourceID="FolderAclDataSource" ShowFooter="True" DataKeyNames="Identifier"> <Columns> <asp:BoundField DataField="Identifier" HeaderText="Identifier" /> <asp:CheckBoxField DataField="CanInsert" HeaderText="Insert" /> @@ -132,15 +109,9 @@ <asp:LinkButton ID="ShowInsertAclEntryBtn" runat="server" OnClick="ShowInsertAclEntryBtn_Click">Insert ACL Entry</asp:LinkButton> <asp:Panel ID="InsertAclPanel" runat="server" Visible="false"> - <h3>Add an ACL Entry</h3> + <h2>Add an ACL Entry</h2> <asp:DetailsView ID="CreateAclDetailView" runat="server" AutoGenerateRows="False" - CellPadding="4" DataSourceID="FolderAclDataSource" DefaultMode="Insert" ForeColor="#333333" - GridLines="None" OnModeChanging="CreateAclDetailView_ModeChanging"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + DataSourceID="FolderAclDataSource" DefaultMode="Insert" OnModeChanging="CreateAclDetailView_ModeChanging"> <Fields> <asp:BoundField DataField="Identifier" HeaderText="Identifier" /> <asp:CheckBoxField DataField="CanInsert" HeaderText="Insert" /> @@ -154,11 +125,7 @@ <asp:CheckBoxField DataField="AdministrativePrivileges" HeaderText="Admin" /> <asp:CommandField ShowInsertButton="True" /> </Fields> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> </asp:DetailsView> </asp:Panel> </asp:Panel> </asp:Content> - Modified: NMail/branches/luke-dev/NMail.Administration.Web/Images/Tango/Thumbs.db =================================================================== (Binary files differ) Modified: NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,6 +1,6 @@ <%@ Page Language="C#" CodeFile="Login.aspx.cs" Inherits="NMail.Administration.Web.Login" MasterPageFile="~/MasterPage.master" Title="NMail Administration - Login" %> -<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:LoginView ID="LoginView" runat="server"> <LoggedInTemplate> You are currently logged in as Modified: NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/Login.aspx.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -38,11 +38,11 @@ Session["RemoteAdministration"] = ra; Session["LocalStore"] = ra.NMailServer.LocalStore; - foreach (IService service in ra.NMailServer.Services) + foreach (ServiceStartInfo service in ra.NMailServer.Services) { - if (service is ISpoolService) + if (service.Service is ISpoolService) { - Session["Spool"] = service; + Session["Spool"] = service.Service; break; } } Modified: NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/MailDomainDetails.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,5 +1,5 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="MailDomainDetails.aspx.cs" Inherits="MailDomainDetails" Title="Mail Domain Details" %> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="MailDomainDetails.aspx.cs" Inherits="MailDomainDetails" Title="NMail Administration - Mail Domain Details" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" runat="server" Visible="false" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> @@ -13,17 +13,9 @@ </asp:Panel> <asp:Panel ID="MainPanel" runat="server"> - <h2>Mail Domain Details</h2> - <asp:DetailsView ID="MailDomainDetailsView" runat="server" CellPadding="4" DataSourceID="MailDomainDataSource" - ForeColor="#333333" GridLines="None" AutoGenerateRows="False" OnItemDeleting="MailDomainDetailsView_ItemDeleting"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> + <h1>Mail Domain Details</h1> + <asp:DetailsView ID="MailDomainDetailsView" runat="server" DataSourceID="MailDomainDataSource" + AutoGenerateRows="False" OnItemDeleting="MailDomainDetailsView_ItemDeleting"> <Fields> <asp:BoundField DataField="MailDomainId" HeaderText="Mail Domain Id" SortExpression="MailDomainId" /> <asp:BoundField DataField="PrimaryHost" HeaderText="Primary Host" SortExpression="PrimaryHost" /> @@ -46,4 +38,3 @@ </asp:ObjectDataSource> </asp:Panel> </asp:Content> - Modified: NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/MasterPage.master 2006-07-11 12:24:16 UTC (rev 57) @@ -25,61 +25,55 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> - <title>Untitled Page</title> - <link href="StyleSheet.css" rel="stylesheet" type="text/css" /> + <title>NMail Administration</title> </head> <body> <form id="MainForm" runat="server"> <table border="0" cellpadding="0" cellspacing="0" style="width: 100%; height: 100%"> <tr> <td colspan="2" style="vertical-align: middle; width: 100%;"> - <div class="box"> - <h1> - <img src="Images/nmail-logo.png" style="vertical-align: middle" /> - NMail Web Administration</h1> - <table> - <tr> - <td style="width: 100%"> - <asp:SiteMapPath ID="SiteMapPath" runat="server" Font-Names="Verdana" Font-Size="0.8em" - PathSeparator=" : "> - <PathSeparatorStyle Font-Bold="True" ForeColor="#1C5E55" /> - <CurrentNodeStyle ForeColor="#333333" /> - <NodeStyle Font-Bold="True" ForeColor="#666666" /> - <RootNodeStyle Font-Bold="True" ForeColor="#1C5E55" /> - </asp:SiteMapPath> - </td> - <td> - <asp:LoginStatus ID="LoginStatus" runat="server" /> - </td> - </tr> - </table> + <div class="title-box"> + <p class="title"> + <span class="title-nmail"> + <img src="Images/nmail-logo-white.png" style="vertical-align: middle" />NMail + </span> + <br /> + Web Administration + </p> </div> + <table class="status-box"> + <tr> + <td style="width: 100%"> + <asp:SiteMapPath ID="SiteMapPath" runat="server" PathSeparator=" : "> + </asp:SiteMapPath> + </td> + <td> + <asp:LoginStatus ID="LoginStatus" runat="server" /> + </td> + </tr> + </table> </td> </tr> <tr> - <td style="vertical-align: top; height: 100%;"> - <div class="box"> - <asp:TreeView ID="TreeView" runat="server" DataSourceID="SiteMapDataSource" OnTreeNodeDataBound="TreeView_TreeNodeDataBound"> - </asp:TreeView> - <asp:SiteMapDataSource ID="SiteMapDataSource" runat="server" /> - </div> - + <td class="side-bar"> + <asp:TreeView ID="TreeView" runat="server" ShowLines="true" DataSourceID="SiteMapDataSource" OnTreeNodeDataBound="TreeView_TreeNodeDataBound"> + </asp:TreeView> + <asp:SiteMapDataSource ID="SiteMapDataSource" runat="server" /> + <uc1:TaskList ID="TaskList" runat="server" /> <asp:ContentPlaceHolder ID="SiteContentPlaceHolder" runat="server"> </asp:ContentPlaceHolder> </td> - <td style="width: 100%; vertical-align: top;"> - <div style="padding: 0.5em"> - <asp:ContentPlaceHolder ID="ContentPlaceHolder" runat="server"> - </asp:ContentPlaceHolder> - </div> + <td style="width: 100%; vertical-align: top; padding: 0.5em"> + <asp:ContentPlaceHolder ID="ContentPlaceHolder" runat="server"> + </asp:ContentPlaceHolder> </td> </tr> <tr> - <td style="text-align: center; top: 100%;"> - <a href="http://nmailserver.sourceforege.net">NMail homepage.</a></td> - <td> + <td class="side-bar"> + <a href="http://nmailserver.sourceforege.net">NMail homepage.</a> </td> + <td></td> </tr> </table> </form> Modified: NMail/branches/luke-dev/NMail.Administration.Web/SetPasswordPanel.ascx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/SetPasswordPanel.ascx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/SetPasswordPanel.ascx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,12 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="SetPasswordPanel.ascx.cs" Inherits="SetPasswordPanel" %> -<div class="box"> - <h3>Set a new password</h3> - <asp:Image ID="StatusImg" runat="server" /> - <asp:Label ID="StatusMessageLbl" runat="server" /> - - New Password: - <input id="PasswordBox" type="password" runat="server" /> - <br /> - <asp:Button ID="OkBtn" runat="Server" Text="Set" OnClick="OkBtn_Click" /> - <asp:Button ID="CancelBtn" runat="Server" Text="Cancel" OnClick="CancelBtn_Click" /> -</div> \ No newline at end of file +<h2>Set a new password</h2> +<asp:Image ID="StatusImg" runat="server" /> +<asp:Label ID="StatusMessageLbl" runat="server" /> + +New Password: +<input id="PasswordBox" type="password" runat="server" /> +<br /> +<asp:Button ID="OkBtn" runat="Server" Text="Set" OnClick="OkBtn_Click" /> +<asp:Button ID="CancelBtn" runat="Server" Text="Cancel" OnClick="CancelBtn_Click" /> \ No newline at end of file Modified: NMail/branches/luke-dev/NMail.Administration.Web/SpoolDetails.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/SpoolDetails.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/SpoolDetails.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,8 +1,52 @@ <%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="SpoolDetails.aspx.cs" Inherits="SpoolDetails" Title="Untitled Page" %> -<asp:Content ID="Content1" ContentPlaceHolderID="SiteContentPlaceHolder" Runat="Server"> +<%@ Import Namespace="NMail.DataTypes.Spool" %> + +<asp:Content ID="SideContent" ContentPlaceHolderID="SiteContentPlaceHolder" Runat="Server"> </asp:Content> -<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> - <asp:Repeater ID="Repeater1" runat="server" DataSourceID="SpoolMessagesDataSource"> + +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <asp:Repeater ID="MessageRepeater" runat="server" DataSourceID="SpoolMessagesDataSource"> + <ItemTemplate> + <table cellspacing="0"> + <tr> + <td class="header-style">Message Id</td> + <td class="row-style"><%# DataBinder.Eval(Container.DataItem, "MessageId") %></td> + </tr> + <tr> + <td class="header-style">Filtered</td> + <td class="alternating-row-style"><%# DataBinder.Eval(Container.DataItem, "Filtered") %></td> + </tr> + <tr> + <td class="header-style">Date</td> + <td class="row-style"><%# DataBinder.Eval(Container.DataItem, "Date") %></td> + </tr> + <tr> + <td class="header-style">Subject</td> + <td class="alternating-row-style"><%# DataBinder.Eval(Container.DataItem, "Subject") %></td> + </tr> + <tr> + <td class="header-style">Sender</td> + <td class="row-style"><%# DataBinder.Eval(Container.DataItem, "Sender") %></td> + </tr> + <tr> + <td class="header-style">Recipients</td> + <td class="alternating-row-style"> + <asp:GridView ID="RecipientGridView" + runat="server" + AutoGenerateColumns="false" + DataSource='<%# ((SpoolEnvelope) Container.DataItem).Recipients %>'> + + <Columns> + <asp:BoundField DataField="RecipientId" HeaderText="Recipient Id" ReadOnly="True" SortExpression="RecipientId" /> + <asp:BoundField DataField="Address" HeaderText="Email Address" SortExpression="Address" /> + <asp:BoundField DataField="NextDeliveryAttempt" HeaderText="Next Delivery Attempt" SortExpression="NextDeliveryAttempt" /> + <asp:BoundField DataField="DeliveryAttempts" HeaderText="Delivery Attempts" SortExpression="DeliveryAttempts" /> + </Columns> + </asp:GridView> + </td> + </tr> + </table> + </ItemTemplate> </asp:Repeater> <asp:ObjectDataSource ID="SpoolMessagesDataSource" runat="server" SelectMethod="GetSpooledMessages" TypeName="NMail.Administration.Web.SpooledMessageDataSource"></asp:ObjectDataSource> Deleted: NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/StyleSheet.css 2006-07-11 12:24:16 UTC (rev 57) @@ -1,32 +0,0 @@ -body -{ - font-family: Sans-Serif; -} - -h1 -{ - font-size: large; -} - -h2 -{ - font-size: large; - margin-bottom: 0.5em; - margin-top: 1em; -} - -h3 -{ - font-style: italic; - font-size: medium; - margin-bottom: 0.25em; - margin-top: 0.5em; -} - -.box -{ - background-color: #eff3fb; - margin: 0.5em; - border: #507cd1 thin solid; - padding: 0.5em; -} \ No newline at end of file Modified: NMail/branches/luke-dev/NMail.Administration.Web/TaskList.ascx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/TaskList.ascx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/TaskList.ascx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,15 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="TaskList.ascx.cs" Inherits="TaskList" %> -<div class="box"> - <asp:Repeater ID="TaskRepeater" runat="server"> - <HeaderTemplate><ul></HeaderTemplate> - - <ItemTemplate> - <li> - <asp:Image runat="server" ID="Image" ImageUrl='<%# Eval("ImageUrl") %>' /> - <asp:LinkButton runat="server" ID="LinkButton" Text='<%# Eval("Text") %>' /> - </li> - </ItemTemplate> - - <FooterTemplate></ul></FooterTemplate> - </asp:Repeater> -</div> \ No newline at end of file +<asp:Repeater ID="TaskRepeater" runat="server"> + <HeaderTemplate><ul></HeaderTemplate> + + <ItemTemplate> + <li> + <asp:Image runat="server" ID="Image" ImageUrl='<%# Eval("ImageUrl") %>' /> + <asp:LinkButton runat="server" ID="LinkButton" Text='<%# Eval("Text") %>' /> + </li> + </ItemTemplate> + + <FooterTemplate></ul></FooterTemplate> +</asp:Repeater> \ No newline at end of file Modified: NMail/branches/luke-dev/NMail.Administration.Web/UserDetails.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/UserDetails.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/UserDetails.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,9 +1,9 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="UserDetails.aspx.cs" Inherits="UserDetails" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="UserDetails.aspx.cs" Inherits="UserDetails" Title="NMail Administration - User Details" %> <%@ Register Src="SetPasswordPanel.ascx" TagName="SetPasswordPanel" TagPrefix="uc1" %> <%@ Reference Control="~/TaskList.ascx" %> -<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> <asp:Image ID="StatusImage" runat="server" Visible="false" /> <asp:Label ID="StatusMessage" runat="server"></asp:Label> @@ -17,14 +17,8 @@ </asp:Panel> <asp:Panel ID="MainPanel" runat="server"> - <h2>User Details</h2> - <asp:DetailsView ID="UserDetailsView" runat="server" AutoGenerateRows="False" CellPadding="4" - DataSourceID="UserDataSource" ForeColor="#333333" GridLines="None"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <CommandRowStyle BackColor="#D1DDF1" Font-Bold="True" /> - <EditRowStyle BackColor="#2461BF" /> - <RowStyle BackColor="#EFF3FB" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> + <h1>User Details</h1> + <asp:DetailsView ID="UserDetailsView" runat="server" AutoGenerateRows="False" DataSourceID="UserDataSource"> <Fields> <asp:BoundField DataField="Username" HeaderText="Username" SortExpression="Username" /> <asp:BoundField DataField="UserId" HeaderText="User Id" ReadOnly="True" SortExpression="UserId" /> @@ -32,9 +26,6 @@ <asp:BoundField DataField="QuotaWarnLimit" HeaderText="Quota Warn Limit" SortExpression="QuotaWarnLimit" /> <asp:BoundField DataField="QuotaHardLimit" HeaderText="Quota Hard Limit" SortExpression="QuotaHardLimit" /> </Fields> - <FieldHeaderStyle BackColor="#DEE8F5" Font-Bold="True" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> </asp:DetailsView> <asp:ObjectDataSource ID="UserDataSource" runat="server" SelectMethod="GetUser" TypeName="NMail.Administration.Web.UserDataSource" DeleteMethod="DeleteUser" OnDeleting="UserDataSource_Deleting" OnDeleted="UserDataSource_Deleted"> @@ -46,10 +37,8 @@ </DeleteParameters> </asp:ObjectDataSource> - <h2>User's Folders</h2> - <asp:GridView ID="UserFoldersGridView" runat="server" AutoGenerateColumns="False" CellPadding="4" - DataSourceID="UserFolderDataSource" ForeColor="#333333" GridLines="None"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <h1>User's Folders</h1> + <asp:GridView ID="UserFoldersGridView" runat="server" AutoGenerateColumns="False" DataSourceID="UserFolderDataSource"> <Columns> <asp:BoundField DataField="FolderId" HeaderText="Folder Id" SortExpression="FolderId" /> <asp:BoundField DataField="FolderName" HeaderText="Folder Name" ReadOnly="True" SortExpression="FolderName" /> @@ -58,12 +47,6 @@ <asp:HyperLinkField DataNavigateUrlFields="FolderId" DataNavigateUrlFormatString="FolderDetails.aspx?FolderId={0}" Text="details" /> </Columns> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> <EmptyDataTemplate> The user doesn't have any folders. </EmptyDataTemplate> @@ -76,7 +59,7 @@ </asp:ObjectDataSource> </asp:Panel> </asp:Content> -<asp:Content ID="SiteContent" runat="server" ContentPlaceHolderID="SiteContentPlaceHolder"> +<asp:Content ID="SideContent" runat="server" ContentPlaceHolderID="SiteContentPlaceHolder"> <uc1:SetPasswordPanel ID="SetPasswordPanel" runat="server" Visible="false" /> </asp:Content> Modified: NMail/branches/luke-dev/NMail.Administration.Web/ViewFolders.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/ViewFolders.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/ViewFolders.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,9 +1,7 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ViewFolders.aspx.cs" Inherits="ViewFolders" Title="Folders" %> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> - <h2>Folders</h2> - <asp:GridView ID="FoldersGridView" runat="server" AutoGenerateColumns="False" CellPadding="4" - DataSourceID="FoldersDataSource" ForeColor="#333333" GridLines="None"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ViewFolders.aspx.cs" Inherits="ViewFolders" Title="NMail Administration - Folders" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <h1>Folders</h1> + <asp:GridView ID="FoldersGridView" runat="server" AutoGenerateColumns="False" DataSourceID="FoldersDataSource"> <Columns> <asp:BoundField DataField="FolderId" HeaderText="Folder Id" SortExpression="FolderId" /> <asp:HyperLinkField DataNavigateUrlFields="ParentId" DataNavigateUrlFormatString="FolderDetails.aspx?FolderId={0}" @@ -13,12 +11,6 @@ <asp:CheckBoxField DataField="HasChildren" HeaderText="Has Children" SortExpression="HasChildren" /> <asp:HyperLinkField DataNavigateUrlFields="FolderId" DataNavigateUrlFormatString="FolderDetails.aspx?FolderId={0}" Text="details" /> </Columns> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> <EmptyDataTemplate> There are no folders currently in the system. </EmptyDataTemplate> Modified: NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/ViewMailDomains.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,23 +1,15 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ViewMailDomains.aspx.cs" Inherits="ViewMailDomains" Title="Mail Domains" %> -<asp:Content ID="Content" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> - <h2>Mail Domains</h2> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="ViewMailDomains.aspx.cs" Inherits="ViewMailDomains" Title="NMail Administration -Mail Domains" %> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <h1>Mail Domains</h1> <asp:ObjectDataSource ID="MailDomainDataSource" runat="server" SelectMethod="GetMailDomains" TypeName="NMail.Administration.Web.MailDomainDataSource"> </asp:ObjectDataSource> - <asp:GridView ID="GridView1" runat="server" AllowSorting="True" - CellPadding="4" DataSourceID="MailDomainDataSource" ForeColor="#333333" GridLines="None" AutoGenerateColumns="False"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> + <asp:GridView ID="MailDomainsGridView" runat="server" AllowSorting="True" DataSourceID="MailDomainDataSource" AutoGenerateColumns="False"> <Columns> <asp:BoundField DataField="MailDomainId" HeaderText="MailDomainId" SortExpression="MailDomainId" /> <asp:BoundField DataField="PrimaryHost" HeaderText="Primary Host" SortExpression="PrimaryHost" /> <asp:HyperLinkField DataNavigateUrlFields="MailDomainId" DataNavigateUrlFormatString="MailDomainDetails.aspx?MailDomainId={0}" Text="details" /> </Columns> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> <EmptyDataTemplate> There are no mail domains currently defined in the system. </EmptyDataTemplate> Modified: NMail/branches/luke-dev/NMail.Administration.Web/ViewUsers.aspx =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/ViewUsers.aspx 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/ViewUsers.aspx 2006-07-11 12:24:16 UTC (rev 57) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" Title="Users" %> +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" Title="NMail Administration - Users" %> <%@ Reference Control="~/TaskList.ascx" %> <script runat="server"> @@ -20,10 +20,9 @@ } </script> -<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> - <h2>Users</h2> - <asp:GridView ID="GridView1" runat="server" DataSourceID="UserDataSource" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" CellPadding="4" ForeColor="#333333" GridLines="None"> - <FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> +<asp:Content ID="MainContent" ContentPlaceHolderID="ContentPlaceHolder" Runat="Server"> + <h1>Users</h1> + <asp:GridView ID="UsersGridView" runat="server" DataSourceID="UserDataSource" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"> <Columns> <asp:BoundField DataField="UserId" HeaderText="UserId" SortExpression="UserId" /> <asp:BoundField DataField="Username" HeaderText="Username" SortExpression="Username" /> @@ -32,12 +31,6 @@ <asp:BoundField DataField="QuotaHardLimit" HeaderText="QuotaHardLimit" SortExpression="QuotaHardLimit" /> <asp:HyperLinkField DataNavigateUrlFields="UserId" DataNavigateUrlFormatString="UserDetails.aspx?UserId={0}" Text="details" /> </Columns> - <RowStyle BackColor="#EFF3FB" /> - <EditRowStyle BackColor="#2461BF" /> - <SelectedRowStyle BackColor="#D1DDF1" Font-Bold="True" ForeColor="#333333" /> - <PagerStyle BackColor="#2461BF" ForeColor="White" HorizontalAlign="Center" /> - <HeaderStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" /> - <AlternatingRowStyle BackColor="White" /> <EmptyDataTemplate> No users currently in the system. </EmptyDataTemplate> Modified: NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/Web.sitemap 2006-07-11 12:24:16 UTC (rev 57) @@ -2,6 +2,7 @@ <siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" > <siteMapNode url="Default.aspx" title="Home" description=""> <siteMapNode url="Login.aspx" title="Login" description="" /> + <siteMapNode url="SpoolDetails.aspx" title="Spool" description="" /> <siteMapNode url="ViewMailDomains.aspx" title="Mail Domains" description="" imageUrl="~/Images/Tango/MailDomain.png" /> <siteMapNode url="ViewUsers.aspx" title="Users" description="" imageUrl="~/Images/Tango/User.png" /> <siteMapNode url="ViewFolders.aspx" title="Folders" description="" imageUrl="~/Images/Tango/OpenFolder.png" /> Modified: NMail/branches/luke-dev/NMail.Administration.Web/web.config =================================================================== --- NMail/branches/luke-dev/NMail.Administration.Web/web.config 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Administration.Web/web.config 2006-07-11 12:24:16 UTC (rev 57) @@ -11,6 +11,8 @@ <appSettings/> <connectionStrings/> <system.web> + <pages theme="Default" /> + <!-- Set compilation debug="true" to insert debugging symbols into the compiled page. Because this Modified: NMail/branches/luke-dev/NMail.Server.Console/NMail.config =================================================================== --- NMail/branches/luke-dev/NMail.Server.Console/NMail.config 2006-07-05 12:05:15 UTC (rev 56) +++ NMail/branches/luke-dev/NMail.Server.Console/NMail.config 2006-07-11 12:24:16 UTC (rev 57) @@ -63,11 +63,14 @@ <NMail.ImapService VisibleHost="localhost" - CertificateFile="NMail.pfx"> - + CertificateFile="NMail.pfx" + AllowInsecureLogon="true"> + <!-- TODO: for testing only!!! remove above line!! --> + <!-- --> + <Listen> - <EndPoint Address="127.0.0.1" Port="143" /> - <!-- <EndPoint Address="0.0.0.0" Port="143" /> --> + <!-- <EndPoint Address="127.0.0.1" Port="143" /> --> + <EndPoint Address="0.0.0.0" Port="143" /> </Listen> <ListenSecure> <EndPoint Address="127.0.0.1" Port="993" /> Added: NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.Designer.cs =================================================================== --- NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.Designer.cs (rev 0) +++ NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.Designer.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,46 @@ +namespace NMail.SetupWizard { + partial class BaseForm { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() { + this.SuspendLayout(); + // + // BaseForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(457, 355); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.Name = "BaseForm"; + this.Text = "NMail Setup Wizard"; + this.ResumeLayout(false); + + } + + #endregion + + } +} + Added: NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.cs =================================================================== --- NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.cs (rev 0) +++ NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace NMail.SetupWizard { + public partial class BaseForm : Form { + public BaseForm() { + InitializeComponent(); + } + + public void SetPanel(BasePanel panel) { + this.Controls.Clear(); + + panel.Dock = DockStyle.Fill; + this.Controls.Add(panel); + } + } +} \ No newline at end of file Added: NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.resx =================================================================== --- NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.resx (rev 0) +++ NMail/branches/luke-dev/NMail.SetupWizard/BaseForm.resx 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file Added: NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.Designer.cs =================================================================== --- NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.Designer.cs (rev 0) +++ NMail/branches/luke-dev/NMail.SetupWizard/BasePanel.Designer.cs 2006-07-11 12:24:16 UTC (rev 57) @@ -0,0 +1,148 @@ +namespace NMail.SetupWizard { + partial class BasePanel { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() { + this.nextButton = new System.Windows.Forms.Button(); + this.titleLabel = new System.Windows.Forms.Label(); + this.mainPanel = new System.Windows.Forms.Panel(); + this.topPanel = new System.Windows.Forms.Panel(); + this.backButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.leftPanel = new System.Windows.Forms.Panel(); + this.buttonPanel = new System.Windows.Forms.Panel(); + this.topPanel.SuspendLayout(); + this.buttonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // nextButton + // + this.nextButton.Location = new System.Drawing.P... [truncated message content] |
