From 9aeec366425dae3a591bf5e45f9fc8199eb58eeb Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Tue, 2 Feb 2010 10:37:21 +0000 Subject: [PATCH] Fixed and closed #462: no-wrap via CSS rather than hardcoded non-breaking spaces. --- WebApplication/AllPages.aspx.cs | 12 ++++++------ WebApplication/Themes/Default-v2/Screen_Styles.css | 1 + WebApplication/Themes/Default/Screen_Styles.css | 1 + WebApplication/Themes/Elegant/Screen_Styles.css | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/WebApplication/AllPages.aspx.cs b/WebApplication/AllPages.aspx.cs index 10df4a7..664d807 100644 --- a/WebApplication/AllPages.aspx.cs +++ b/WebApplication/AllPages.aspx.cs @@ -180,7 +180,7 @@ namespace ScrewTurn.Wiki { sb.Append(@""" title="""); sb.Append(Properties.Messages.SortByDate); sb.Append(@""">"); - sb.Append(Properties.Messages.CreatedOn.Replace(" ", " ")); + sb.Append(Properties.Messages.CreatedOn); sb.Append((reverse && sortBy.Equals("creation") ? " ↑" : "")); sb.Append((!reverse && sortBy.Equals("creation") ? " ↓" : "")); sb.Append(""); @@ -195,7 +195,7 @@ namespace ScrewTurn.Wiki { sb.Append(@""" title="""); sb.Append(Properties.Messages.SortByDate); sb.Append(@""">"); - sb.Append(Properties.Messages.ModifiedOn.Replace(" ", " ")); + sb.Append(Properties.Messages.ModifiedOn); sb.Append((reverse && sortBy.Equals("date") ? " ↑" : "")); sb.Append((!reverse && sortBy.Equals("date") ? " ↓" : "")); sb.Append(""); @@ -210,7 +210,7 @@ namespace ScrewTurn.Wiki { sb.Append(@""" title="""); sb.Append(Properties.Messages.SortByUser); sb.Append(@""">"); - sb.Append(Properties.Messages.CreatedBy.Replace(" ", " ")); + sb.Append(Properties.Messages.CreatedBy); sb.Append((reverse && sortBy.Equals("creator") ? " ↑" : "")); sb.Append((!reverse && sortBy.Equals("creator") ? " ↓" : "")); sb.Append(""); @@ -225,7 +225,7 @@ namespace ScrewTurn.Wiki { sb.Append(@""" title="""); sb.Append(Properties.Messages.SortByUser); sb.Append(@""">"); - sb.Append(Properties.Messages.ModifiedBy.Replace(" ", " ")); + sb.Append(Properties.Messages.ModifiedBy); sb.Append((reverse && sortBy.Equals("user") ? " ↑" : "")); sb.Append((!reverse && sortBy.Equals("user") ? " ↓" : "")); sb.Append(""); @@ -292,12 +292,12 @@ namespace ScrewTurn.Wiki { // Creation date/time sb.Append(@""); - sb.Append(Preferences.AlignWithTimezone(pageList[i].CreationDateTime).ToString(Settings.DateTimeFormat).Replace(" ", " ") + " "); + sb.Append(Preferences.AlignWithTimezone(pageList[i].CreationDateTime).ToString(Settings.DateTimeFormat) + " "); sb.Append(""); // Mod. date/time sb.Append(@""); - sb.Append(Preferences.AlignWithTimezone(pageList[i].ModificationDateTime).ToString(Settings.DateTimeFormat).Replace(" ", " ") + " "); + sb.Append(Preferences.AlignWithTimezone(pageList[i].ModificationDateTime).ToString(Settings.DateTimeFormat) + " "); sb.Append(""); // Creator diff --git a/WebApplication/Themes/Default-v2/Screen_Styles.css b/WebApplication/Themes/Default-v2/Screen_Styles.css index fb119df..74bfefc 100644 --- a/WebApplication/Themes/Default-v2/Screen_Styles.css +++ b/WebApplication/Themes/Default-v2/Screen_Styles.css @@ -248,6 +248,7 @@ tr.tableheader td, th { margin: 0px; padding: 2px 5px 2px 5px; border-bottom: solid 1px #999999; + white-space: nowrap; } tr.tablerow td { diff --git a/WebApplication/Themes/Default/Screen_Styles.css b/WebApplication/Themes/Default/Screen_Styles.css index aa072d2..3ffbc3d 100644 --- a/WebApplication/Themes/Default/Screen_Styles.css +++ b/WebApplication/Themes/Default/Screen_Styles.css @@ -270,6 +270,7 @@ tr.tableheader td, th { margin: 0px; padding: 2px 5px 2px 5px; border-bottom: solid 1px #DDDDDD; + white-space: nowrap; } tr.tablerow td { diff --git a/WebApplication/Themes/Elegant/Screen_Styles.css b/WebApplication/Themes/Elegant/Screen_Styles.css index 34e56f2..e1a559a 100644 --- a/WebApplication/Themes/Elegant/Screen_Styles.css +++ b/WebApplication/Themes/Elegant/Screen_Styles.css @@ -250,6 +250,7 @@ tr.tableheader td, th { margin: 0px; padding: 2px 5px 2px 5px; border-bottom: solid 1px #999999; + white-space: nowrap; } tr.tablerow td {