[Fat-develop] FAT/src/FAT.Web DefaultPageModel.cs,1.4,1.5
Brought to you by:
exortech
|
From: <dmc...@pr...> - 2004-02-01 12:29:07
|
Update of /cvsroot/fat/FAT/src/FAT.Web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18067/src/FAT.Web Modified Files: DefaultPageModel.cs Log Message: Relative urls in html is now expanded so that <img src="url" >, <a href="url" >, <form action="url" > etc. work in thumbnail creation and in IE pop-up when thumbnail is clicked. Introduced "view source" link so that original, unmodified html source is still accessible. Index: DefaultPageModel.cs =================================================================== RCS file: /cvsroot/fat/FAT/src/FAT.Web/DefaultPageModel.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DefaultPageModel.cs 28 Jan 2004 22:14:48 -0000 1.4 --- DefaultPageModel.cs 1 Feb 2004 12:27:15 -0000 1.5 *************** *** 66,70 **** { string id = htmlDetailsStore.Add(new HtmlDetailsEnhancer(HtmlDetailsLog.Url, HtmlDetailsLog.Html)); ! return CreateImageHyperLinkCell(HtmlDetailsRequestHelper.CreateImageUrl(id), HtmlDetailsRequestHelper.CreateHtmlWithAbsoluteUrlsUrl(id)); } } --- 66,70 ---- { string id = htmlDetailsStore.Add(new HtmlDetailsEnhancer(HtmlDetailsLog.Url, HtmlDetailsLog.Html)); ! return CreateImageHyperLinkCell(HtmlDetailsRequestHelper.CreateImageUrl(id), HtmlDetailsRequestHelper.CreateHtmlWithAbsoluteUrlsUrl(id), HtmlDetailsRequestHelper.CreateHtmlUrl(id)); } } *************** *** 92,103 **** } ! private TableCell CreateImageHyperLinkCell(string imageUrl, string clickUrl) { HyperLink image = new HyperLink(); ! image.NavigateUrl = clickUrl; image.ImageUrl = imageUrl; image.Target = "_blank"; ! return CreateTableCell(image); } --- 92,114 ---- } ! private TableCell CreateImageHyperLinkCell(string imageUrl, string htmlWithAbsoluteUrlsUrl, string htmlUrl) { + TableCell cell = new TableCell(); + HyperLink image = new HyperLink(); ! image.NavigateUrl = htmlWithAbsoluteUrlsUrl; image.ImageUrl = imageUrl; image.Target = "_blank"; + cell.Controls.Add(image); ! cell.Controls.Add(new LiteralControl("<br>")); ! ! HyperLink href = new HyperLink(); ! href.NavigateUrl = htmlUrl; ! href.Text = "view source"; ! href.Target = "_blank"; ! cell.Controls.Add(href); ! ! return cell; } |