[Yafdotnet-cvs] yafsrc/pages/admin attachments.ascx, 1.11, 1.12 boardsettings.ascx.cs, 1.16, 1.17 s

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/yafdotnet/yafsrc/pages/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8969/pages/admin

Modified Files:
	attachments.ascx boardsettings.ascx.cs smilies.ascx 
	smilies.ascx.designer.cs 
Log Message:
Fixes

Index: boardsettings.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/boardsettings.ascx.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** boardsettings.ascx.cs	19 Jan 2007 13:16:17 -0000	1.16
--- boardsettings.ascx.cs	14 Mar 2007 19:18:30 -0000	1.17
***************
*** 31,35 ****
  using YAF.Classes.Data;
  
! namespace YAF.Pages.Admin {
  	/// <summary>
  	/// Summary description for settings.
--- 31,36 ----
  using YAF.Classes.Data;
  
! namespace YAF.Pages.Admin
! {
  	/// <summary>
  	/// Summary description for settings.
***************
*** 37,48 ****
  	public partial class boardsettings : YAF.Classes.Base.AdminPage
  	{
! 	
! 		protected void Page_Load(object sender, System.EventArgs e) 
  		{
! 			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
! 				PageLinks.AddLink("Board Settings","");
  
  				// create list boxes by populating datasources from Data class
--- 38,49 ----
  	public partial class boardsettings : YAF.Classes.Base.AdminPage
  	{
! 
! 		protected void Page_Load( object sender, System.EventArgs e )
  		{
! 			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin ) );
! 				PageLinks.AddLink( "Board Settings", "" );
  
  				// create list boxes by populating datasources from Data class
***************
*** 60,68 ****
  
  				BindData();
! 				
! 				Theme.Items.FindByValue(PageContext.BoardSettings.Theme).Selected = true;
! 				Language.Items.FindByValue(PageContext.BoardSettings.Language).Selected = true;
! 				ShowTopic.Items.FindByValue(PageContext.BoardSettings.ShowTopicsDefault.ToString()).Selected = true;
!                 AllowThemedLogo.Checked = PageContext.BoardSettings.AllowThemedLogo;
  			}
  		}
--- 61,69 ----
  
  				BindData();
! 
! 				Theme.Items.FindByValue( PageContext.BoardSettings.Theme ).Selected = true;
! 				Language.Items.FindByValue( PageContext.BoardSettings.Language ).Selected = true;
! 				ShowTopic.Items.FindByValue( PageContext.BoardSettings.ShowTopicsDefault.ToString() ).Selected = true;
! 				AllowThemedLogo.Checked = PageContext.BoardSettings.AllowThemedLogo;
  			}
  		}
***************
*** 71,84 ****
  		{
  			DataRow row;
! 			using(DataTable dt = YAF.Classes.Data.DB.board_list(PageContext.PageBoardID))
! 				row = dt.Rows[0];
  
  			DataBind();
! 			Name.Text = (string)row["Name"];
! 			AllowThreaded.Checked = (bool)row["AllowThreaded"];
  		}
  
  		#region Web Form Designer generated code
! 		override protected void OnInit(EventArgs e)
  		{
  			//
--- 72,85 ----
  		{
  			DataRow row;
! 			using ( DataTable dt = YAF.Classes.Data.DB.board_list( PageContext.PageBoardID ) )
! 				row = dt.Rows [0];
  
  			DataBind();
! 			Name.Text = ( string ) row ["Name"];
! 			AllowThreaded.Checked = ( bool ) row ["AllowThreaded"];
  		}
  
  		#region Web Form Designer generated code
! 		override protected void OnInit( EventArgs e )
  		{
  			//
***************
*** 86,92 ****
  			//
  			InitializeComponent();
! 			base.OnInit(e);
  		}
! 		
  		/// <summary>
  		/// Required method for Designer support - do not modify
--- 87,93 ----
  			//
  			InitializeComponent();
! 			base.OnInit( e );
  		}
! 
  		/// <summary>
  		/// Required method for Designer support - do not modify
***************
*** 94,110 ****
  		/// </summary>
  		private void InitializeComponent()
! 		{    
  
  		}
  		#endregion
  
! 		protected void Save_Click(object sender, System.EventArgs e)
  		{
!             YAF.Classes.Data.DB.board_save(PageContext.PageBoardID, Name.Text, AllowThreaded.Checked);
  
  			PageContext.BoardSettings.Theme = Theme.SelectedValue;
  			PageContext.BoardSettings.Language = Language.SelectedValue;
! 			PageContext.BoardSettings.ShowTopicsDefault = Convert.ToInt32(ShowTopic.SelectedValue);
!             PageContext.BoardSettings.AllowThemedLogo = AllowThemedLogo.Checked;
  			/// save the settings to the database
  			PageContext.BoardSettings.SaveRegistry();
--- 95,111 ----
  		/// </summary>
  		private void InitializeComponent()
! 		{
  
  		}
  		#endregion
  
! 		protected void Save_Click( object sender, System.EventArgs e )
  		{
! 			YAF.Classes.Data.DB.board_save( PageContext.PageBoardID, Name.Text, AllowThreaded.Checked );
  
  			PageContext.BoardSettings.Theme = Theme.SelectedValue;
  			PageContext.BoardSettings.Language = Language.SelectedValue;
! 			PageContext.BoardSettings.ShowTopicsDefault = Convert.ToInt32( ShowTopic.SelectedValue );
! 			PageContext.BoardSettings.AllowThemedLogo = AllowThemedLogo.Checked;
  			/// save the settings to the database
  			PageContext.BoardSettings.SaveRegistry();
***************
*** 113,117 ****
  			PageContext.BoardSettings = null;
  
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_admin);
  		}
  	}
--- 114,118 ----
  			PageContext.BoardSettings = null;
  
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_admin );
  		}
  	}

Index: smilies.ascx.designer.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies.ascx.designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** smilies.ascx.designer.cs	21 Dec 2006 16:01:57 -0000	1.3
--- smilies.ascx.designer.cs	14 Mar 2007 19:18:30 -0000	1.4
***************
*** 2,6 ****
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.42
  //
  //     Changes to this file may cause incorrect behavior and will be lost if
--- 2,6 ----
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.91
  //
  //     Changes to this file may cause incorrect behavior and will be lost if

Index: attachments.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/attachments.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** attachments.ascx	31 Jan 2007 13:37:10 -0000	1.11
--- attachments.ascx	14 Mar 2007 19:18:30 -0000	1.12
***************
*** 1,49 ****
! <%@ Control language="c#" Codebehind="attachments.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.attachments" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF.Controls" %>
! 
! <YAF:PageLinks runat="server" id="PageLinks"/>
! 
! <YAF:adminmenu runat="server">
! 
! <table class=content width="100%" cellspacing=1 cellpadding=0>
! <tr>
! 	<td class=header1 colspan="8">Attachments</td>
! </tr>
! 
! <asp:repeater runat="server" id="List">
! 	<HeaderTemplate>
! 		<tr class="header2">
! 			<td>Forum</td>
! 			<td>Topic</td>
! 			<td>Posted</td>
! 			<td>File Name</td>
! 			<td align="right">Downloads</td>
! 			<td>Content Type</td>
! 			<td align="right">Size</td>
! 			<td>&nbsp;</td>
! 		</tr>
! 	</HeaderTemplate>
! 	<ItemTemplate>
! 		<tr class=post>
! 			<td><a target="_top" href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.topics,"f={0}",Eval("ForumID")) %>'><%# Eval("ForumName") %></a></td>
! 			<td><a target="_top" href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.posts,"t={0}",Eval("TopicID")) %>'><%# Eval("TopicName") %></a></td>
! 			<td><%# FormatDateTimeShort(Eval( "Posted")) %></td>
! 			<td><%# Eval( "FileName") %></td>
! 			<td align="right"><%# Eval( "Downloads") %></td>
! 			<td><%# Eval( "ContentType") %></td>
! 			<td align="right"><%# Eval( "Bytes") %></td>
! 			<td>
! 				<asp:linkbutton runat="server" onload="Delete_Load" commandname="delete" commandargument='<%# Eval( "AttachmentID") %>'>Delete</asp:linkbutton>
! 			</td>
! 		</tr>
! 	</ItemTemplate>
! </asp:repeater>
! 
! </table>
! 
! </YAF:adminmenu>
! 
! <YAF:SmartScroller id="SmartScroller1" runat = "server" />
--- 1,69 ----
! <%@ Control Language="c#" Codebehind="attachments.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.attachments" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF.Controls" %>
! <YAF:PageLinks runat="server" ID="PageLinks" />
! <YAF:AdminMenu runat="server">
!     <table class="content" width="100%" cellspacing="1" cellpadding="0">
!         <tr>
!             <td class="header1" colspan="8">
!                 Attachments</td>
!         </tr>
!         <asp:Repeater runat="server" ID="List">
!             <HeaderTemplate>
!                 <tr class="header2">
!                     <td>
!                         Forum</td>
!                     <td>
!                         Topic</td>
!                     <td>
!                         Posted</td>
!                     <td>
!                         File Name</td>
!                     <td align="right">
!                         Downloads</td>
!                     <td>
!                         Content Type</td>
!                     <td align="right">
!                         Size</td>
!                     <td>
!                         &nbsp;</td>
!                 </tr>
!             </HeaderTemplate>
!             <ItemTemplate>
!                 <tr class="post">
!                     <td>
!                         <a target="_top" href='<%# yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.topics,"f={0}",Eval("ForumID")) %>'>
!                             <%# Eval("ForumName") %>
!                         </a>
!                     </td>
!                     <td>
!                         <a target="_top" href='<%# yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.posts,"t={0}",Eval("TopicID")) %>'>
!                             <%# Eval("TopicName") %>
!                         </a>
!                     </td>
!                     <td>
!                         <%# yaf_DateTime.FormatDateTimeShort(Eval( "Posted")) %>
!                     </td>
!                     <td>
!                         <%# Eval( "FileName") %>
!                     </td>
!                     <td align="right">
!                         <%# Eval( "Downloads") %>
!                     </td>
!                     <td>
!                         <%# Eval( "ContentType") %>
!                     </td>
!                     <td align="right">
!                         <%# Eval( "Bytes") %>
!                     </td>
!                     <td>
!                         <asp:LinkButton runat="server" OnLoad="Delete_Load" CommandName="delete" CommandArgument='<%# Eval( "AttachmentID") %>'>Delete</asp:LinkButton>
!                     </td>
!                 </tr>
!             </ItemTemplate>
!         </asp:Repeater>
!     </table>
! </YAF:AdminMenu>
! <YAF:SmartScroller ID="SmartScroller1" runat="server" />

Index: smilies.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies.ascx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** smilies.ascx	31 Jan 2007 13:37:11 -0000	1.12
--- smilies.ascx	14 Mar 2007 19:18:30 -0000	1.13
***************
*** 30,34 ****
  	<tr>
  		<td class="post"><%# Eval("Code") %></td>
! 		<td class="post" align="center"><img src='<%# YAF.Data.ForumRoot %>images/emoticons/<%# Eval("Icon") %>'/></td>		
  		<td class="post"><%# Eval("Emoticon") %></td>
  		<td class="post">
--- 30,34 ----
  	<tr>
  		<td class="post"><%# Eval("Code") %></td>
! 		<td class="post" align="center"><img src="<%# yaf_ForumInfo.ForumRoot %>images/emoticons/<%# Eval("Icon") %>"/></td>		
  		<td class="post"><%# Eval("Emoticon") %></td>
  		<td class="post">

[Yafdotnet-cvs] yafsrc/pages/admin attachments.ascx, 1.11, 1.12 boardsettings.ascx.cs, 1.16, 1.17 s

[Yafdotnet-cvs] yafsrc/pages/admin attachments.ascx, 1.11, 1.12 boardsettings.ascx.cs, 1.16, 1.17 smilies.ascx, 1.12, 1.13 smilies.ascx.designer.cs, 1.3, 1.4