diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index eb6fa5a..d0af645 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -773 \ No newline at end of file +783 \ No newline at end of file diff --git a/Common/Common.csproj b/Common/Common.csproj index ae4f55c..79e6f85 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -97,6 +97,7 @@ + diff --git a/Common/dataobjects/User.cs b/Common/dataobjects/User.cs index 561af49..294631b 100644 --- a/Common/dataobjects/User.cs +++ b/Common/dataobjects/User.cs @@ -91,6 +91,11 @@ namespace FLocal.Common.dataobjects { return this._userGroupId; } } + public UserGroup userGroup { + get { + return UserGroup.LoadById(this.userGroupId); + } + } private string _showPostsToUsers; public string showPostsToUsers { @@ -170,7 +175,7 @@ namespace FLocal.Common.dataobjects { new XElement("title", this.title), new XElement("location", this.location), new XElement("name", this.name), - new XElement("userGroupId", this.userGroupId), + this.userGroup.exportToXml(context), new XElement("showPostsToUsers", this.showPostsToUsers) ); if(this.avatarId.HasValue) { diff --git a/static/css/global.css b/static/css/global.css index e8dad68..2da842b 100644 --- a/static/css/global.css +++ b/static/css/global.css @@ -90,4 +90,9 @@ pre height:expression((this.scrollHeight >= 80) ? '80px' : 'auto'); max-width:80px; width:expression((this.scrollHeight >= 80) ? '80px' : 'auto'); -} \ No newline at end of file +} +.UG_Blondes { + color:red !important; + background-color:yellow !important; + font-weight: bold !important; +} diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt index 8f32690..61bd85f 100644 --- a/templates/Full/elems/Main.xslt +++ b/templates/Full/elems/Main.xslt @@ -155,7 +155,11 @@ - + + + separate + UG_ + /User//