Fixed url issue in search.

Made page tree list in manager more compact.
cuyahogaproject · Mar 3, 2010 · 2532522 · 2532522
1 parent 5c3f57b
commit 2532522
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/src/Cuyahoga.Core/Domain/ContentItem.cs b/src/Cuyahoga.Core/Domain/ContentItem.cs
@@ -5,6 +5,7 @@
 using System.Security.Principal;
 using Castle.Components.Validator;
 using Cuyahoga.Core.Service.Membership;
+using Cuyahoga.Core.Util;
 using Cuyahoga.Core.Validation;
 
 namespace Cuyahoga.Core.Domain
@@ -271,7 +272,7 @@ protected ContentItem()
 		/// </summary>
 		public virtual string GetContentUrl()
 		{
-			string defaultUrlFormat = "{0}/section.aspx/{1}";
+			string defaultUrlFormat = UrlUtil.GetApplicationPath() + "{0}/section.aspx/{1}";
 			if (this._section == null)
 			{
 				throw new InvalidOperationException("Unable to get the url for the content because the associated section is missing.");

diff --git a/src/Cuyahoga.Core/Domain/FileResource.cs b/src/Cuyahoga.Core/Domain/FileResource.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Cuyahoga.Core.Service.Search;
+using Cuyahoga.Core.Util;
 
 namespace Cuyahoga.Core.Domain
 {
@@ -80,7 +81,7 @@ public override bool SupportsItemLevelPermissions
 
 		public override string GetContentUrl()
 		{
-			string defaultUrlFormat = "{0}/section.aspx/Download/{1}/{2}";
+			string defaultUrlFormat =  UrlUtil.GetApplicationPath() + "{0}/section.aspx/Download/{1}/{2}";
 			if (this.Section == null)
 			{
 				throw new InvalidOperationException("Unable to get the url for the content because the associated section is missing.");

diff --git a/src/Cuyahoga.Modules.Articles/Web/Articles.ascx.cs b/src/Cuyahoga.Modules.Articles/Web/Articles.ascx.cs
@@ -100,7 +100,7 @@ protected void rptArticles_ItemDataBound(object sender, RepeaterItemEventArgs e)
 				DisplayType displayType = (DisplayType)Enum.Parse(typeof(DisplayType), this.Module.Section.Settings["DISPLAY_TYPE"].ToString());
 
 				HyperLink hpl = e.Item.FindControl("hplTitle") as HyperLink;
-				string articleUrl = UrlUtil.GetApplicationPath() + article.GetContentUrl();
+				string articleUrl = article.GetContentUrl();
 				hpl.NavigateUrl = articleUrl;
 
 				Panel pnlSummary = e.Item.FindControl("pnlSummary") as Panel;

diff --git a/src/Cuyahoga.Modules.Downloads/Web/Downloads.ascx.cs b/src/Cuyahoga.Modules.Downloads/Web/Downloads.ascx.cs
@@ -138,7 +138,7 @@ private void rptFiles_ItemDataBound(object sender, RepeaterItemEventArgs e)
 
 			if (file != null && file.IsViewAllowed(base.Page.User))
 			{
-				string downloadUrl = UrlUtil.GetApplicationPath() + file.GetContentUrl();
+				string downloadUrl = file.GetContentUrl();
 				string fileDetails = file.FileName + " (" + file.Length + " bytes)";
 				HyperLink hplFileImg = e.Item.FindControl("hplFileImg") as HyperLink;
 				hplFileImg.NavigateUrl = downloadUrl;

diff --git a/src/Cuyahoga.Web/Manager/Content/Css/manager.pagegrid.css b/src/Cuyahoga.Web/Manager/Content/Css/manager.pagegrid.css
@@ -82,13 +82,14 @@ ul.pagegroup
 
 #pagegrid .pageurl
 {
-	padding: 1px 0;
+	padding: 1px 3px;
+	color: #369;
 }
 
 #pagegrid .pagesub
 {
 	font-size: 90%;
-	color: #999;
+	color: #777;
 }
 
 #pagegrid .pagesub span

diff --git a/src/Cuyahoga.Web/Manager/Views/Pages/PageListItem.ascx b/src/Cuyahoga.Web/Manager/Views/Pages/PageListItem.ascx
@@ -16,11 +16,13 @@
 						<% } %>
 					</div>
 					<div class="pageinfo">
-						<div class="pagetitle">
-							<%= Model.Title %>
-						</div>
-						<div class="pageurl">
-							<%= Model.DisplayUrl %>
+						<div>
+							<span class="pagetitle">
+								<%= Model.Title %>
+							</span>
+							<span class="pageurl">
+								<%= Model.DisplayUrl %>
+							</span>
 						</div>
 						<div class="pagesub">
 							<span><%= GlobalResources.TemplateLabel %>: <%= Model.Template != null ? Model.Template.Name : String.Empty %></span>