Usergroup-dependent coloring of user links implemented

main
Inga 🏳‍🌈 15 years ago
parent d619ed3649
commit 80d9f37b38
  1. 2
      Builder/IISMainHandler/build.txt
  2. 1
      Common/Common.csproj
  3. 7
      Common/dataobjects/User.cs
  4. 7
      static/css/global.css
  5. 6
      templates/Full/elems/Main.xslt

@ -97,6 +97,7 @@
<Compile Include="dataobjects\Upload.cs" /> <Compile Include="dataobjects\Upload.cs" />
<Compile Include="dataobjects\User.cs" /> <Compile Include="dataobjects\User.cs" />
<Compile Include="dataobjects\AccountSettings.cs" /> <Compile Include="dataobjects\AccountSettings.cs" />
<Compile Include="dataobjects\UserGroup.cs" />
<Compile Include="IOutputParams.cs" /> <Compile Include="IOutputParams.cs" />
<Compile Include="ISqlObjectTableSpec.cs" /> <Compile Include="ISqlObjectTableSpec.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />

@ -91,6 +91,11 @@ namespace FLocal.Common.dataobjects {
return this._userGroupId; return this._userGroupId;
} }
} }
public UserGroup userGroup {
get {
return UserGroup.LoadById(this.userGroupId);
}
}
private string _showPostsToUsers; private string _showPostsToUsers;
public string showPostsToUsers { public string showPostsToUsers {
@ -170,7 +175,7 @@ namespace FLocal.Common.dataobjects {
new XElement("title", this.title), new XElement("title", this.title),
new XElement("location", this.location), new XElement("location", this.location),
new XElement("name", this.name), new XElement("name", this.name),
new XElement("userGroupId", this.userGroupId), this.userGroup.exportToXml(context),
new XElement("showPostsToUsers", this.showPostsToUsers) new XElement("showPostsToUsers", this.showPostsToUsers)
); );
if(this.avatarId.HasValue) { if(this.avatarId.HasValue) {

@ -90,4 +90,9 @@ pre
height:expression((this.scrollHeight >= 80) ? '80px' : 'auto'); height:expression((this.scrollHeight >= 80) ? '80px' : 'auto');
max-width:80px; max-width:80px;
width:expression((this.scrollHeight >= 80) ? '80px' : 'auto'); width:expression((this.scrollHeight >= 80) ? '80px' : 'auto');
} }
.UG_Blondes {
color:red !important;
background-color:yellow !important;
font-weight: bold !important;
}

@ -155,7 +155,11 @@
</xsl:template> </xsl:template>
<xsl:template match="user" mode="userLink"> <xsl:template match="user" mode="userLink">
<a class="separate"> <a>
<xsl:attribute name="class">
<xsl:text>separate </xsl:text>
<xsl:text>UG_</xsl:text><xsl:value-of select="group/name"/>
</xsl:attribute>
<xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute> <xsl:attribute name="href">/User/<xsl:value-of select="id"/>/</xsl:attribute>
<xsl:value-of select="name"/> <xsl:value-of select="name"/>
</a> </a>

Loading…
Cancel
Save