Changeset 3395
- Timestamp:
- 11/15/06 23:48:38 (2 years ago)
- Files:
-
- trunk/Resources/Styles/DecafBland.colloquyStyle/Contents/Resources/main.xsl (modified) (2 diffs)
- trunk/Resources/Styles/Fiat.colloquyStyle/Contents/Resources/main.xsl (modified) (2 diffs)
- trunk/Resources/Styles/Synapse.colloquyStyle/Contents/Resources/main.xsl (modified) (2 diffs)
- trunk/Resources/default.css (modified) (1 diff)
- trunk/Resources/default.xsl (modified) (4 diffs)
- trunk/Resources/styleOptions.plist (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Resources/Styles/DecafBland.colloquyStyle/Contents/Resources/main.xsl
r3362 r3395 124 124 <span class="timestamp hidden">] </span> 125 125 <span class="message"> 126 <xsl:apply-templates select="message/child::node()" mode=" copy" />126 <xsl:apply-templates select="message/child::node()" mode="event" /> 127 127 <xsl:if test="string-length(reason)"> 128 128 <span class="reason"> … … 134 134 </span> 135 135 </div> 136 </xsl:template> 137 138 <xsl:template match="span[contains(@class,'member')]" mode="event"> 139 <xsl:variable name="nickname" select="current()" /> 140 <xsl:choose> 141 <xsl:when test="../../node()[node() = $nickname]/@hostmask"> 142 <xsl:variable name="hostmask" select="../../node()[node() = $nickname]/@hostmask" /> 143 <a href="member:{$nickname}" title="{$hostmask}" class="member"><xsl:value-of select="$nickname" /></a> 144 <xsl:if test="../../@name = 'memberJoined' or ../../@name = 'memberParted'"> 145 <span class="hostmask"> 146 <xsl:text> (</xsl:text> 147 <xsl:value-of select="$hostmask" /> 148 <xsl:text>) </xsl:text> 149 </span> 150 </xsl:if> 151 </xsl:when> 152 <xsl:otherwise> 153 <a href="member:{$nickname}" class="member"><xsl:value-of select="$nickname" /></a> 154 </xsl:otherwise> 155 </xsl:choose> 136 156 </xsl:template> 137 157 trunk/Resources/Styles/Fiat.colloquyStyle/Contents/Resources/main.xsl
r3384 r3395 168 168 <span class="hidden">] </span> 169 169 <span class="message"> 170 <xsl:apply-templates select="message/child::node()" mode=" copy" />170 <xsl:apply-templates select="message/child::node()" mode="event" /> 171 171 <xsl:if test="string-length( reason )"> 172 172 <span class="reason"> … … 206 206 <xsl:otherwise> 207 207 <xsl:copy-of select="current()"/> 208 </xsl:otherwise> 209 </xsl:choose> 210 </xsl:template> 211 212 <xsl:template match="span[contains(@class,'member')]" mode="event"> 213 <xsl:variable name="nickname" select="current()" /> 214 <xsl:choose> 215 <xsl:when test="../../node()[node() = $nickname]/@hostmask"> 216 <xsl:variable name="hostmask" select="../../node()[node() = $nickname]/@hostmask" /> 217 <a href="member:{$nickname}" title="{$hostmask}" class="member"><xsl:value-of select="$nickname" /></a> 218 <xsl:if test="../../@name = 'memberJoined' or ../../@name = 'memberParted'"> 219 <span class="hostmask"> 220 <xsl:text> (</xsl:text> 221 <xsl:value-of select="$hostmask" /> 222 <xsl:text>) </xsl:text> 223 </span> 224 </xsl:if> 225 </xsl:when> 226 <xsl:otherwise> 227 <a href="member:{$nickname}" class="member"><xsl:value-of select="$nickname" /></a> 208 228 </xsl:otherwise> 209 229 </xsl:choose> trunk/Resources/Styles/Synapse.colloquyStyle/Contents/Resources/main.xsl
r3385 r3395 25 25 <span class="event"> 26 26 <span class="hidden">[<xsl:value-of select="$timestamp" />] </span> 27 <xsl:apply-templates select="message/child::node()" mode=" copy" />27 <xsl:apply-templates select="message/child::node()" mode="event" /> 28 28 <xsl:text> (</xsl:text> 29 29 <xsl:value-of select="$timestamp" /> … … 164 164 </span> 165 165 </xsl:if> 166 </xsl:template> 167 168 <xsl:template match="span[contains(@class,'member')]" mode="event"> 169 <xsl:variable name="nickname" select="current()" /> 170 <xsl:choose> 171 <xsl:when test="../../node()[node() = $nickname]/@hostmask"> 172 <xsl:variable name="hostmask" select="../../node()[node() = $nickname]/@hostmask" /> 173 <a href="member:{$nickname}" title="{$hostmask}" class="member"><xsl:value-of select="$nickname" /></a> 174 <xsl:if test="../../@name = 'memberJoined' or ../../@name = 'memberParted'"> 175 <span class="hostmask"> 176 <xsl:text> (</xsl:text> 177 <xsl:value-of select="$hostmask" /> 178 <xsl:text>) </xsl:text> 179 </span> 180 </xsl:if> 181 </xsl:when> 182 <xsl:otherwise> 183 <a href="member:{$nickname}" class="member"><xsl:value-of select="$nickname" /></a> 184 </xsl:otherwise> 185 </xsl:choose> 166 186 </xsl:template> 167 187 trunk/Resources/default.css
r3328 r3395 33 33 } 34 34 35 .hostmask { 36 display: none; 37 } 38 35 39 /* For the display mark */ 36 40 hr#mark { trunk/Resources/default.xsl
r3247 r3395 55 55 </xsl:variable> 56 56 57 <xsl:variable name="hostmask" select="sender/@hostmask | ../sender/@hostmask"/> 58 57 59 <div id="{message[1]/@id | @id}" class="{$envelopeClasses}"> 58 60 <span class="timestamp hidden">[</span> … … 66 68 <span class="hidden">• </span> 67 69 </xsl:if> 68 <a href="{$memberLink}" class="{$senderClasses}"><xsl:value-of select="sender | ../sender" /></a>70 <a href="{$memberLink}" title="{$hostmask}" class="{$senderClasses}"><xsl:value-of select="sender | ../sender" /></a> 69 71 <xsl:choose> 70 72 <xsl:when test="message[1]/@action = 'yes' or @action = 'yes'"> … … 99 101 </span> 100 102 <span class="timestamp hidden">] </span> 101 <xsl:apply-templates select="message/child::node()" mode=" copy" />103 <xsl:apply-templates select="message/child::node()" mode="event" /> 102 104 <xsl:if test="string-length( reason )"> 103 105 <span class="reason"> … … 108 110 </xsl:if> 109 111 </div> 112 </xsl:template> 113 114 <xsl:template match="span[contains(@class,'member')]" mode="event"> 115 <xsl:variable name="nickname" select="current()" /> 116 <xsl:choose> 117 <xsl:when test="../../node()[node() = $nickname]/@hostmask"> 118 <xsl:variable name="hostmask" select="../../node()[node() = $nickname]/@hostmask" /> 119 <a href="member:{$nickname}" title="{$hostmask}" class="member"><xsl:value-of select="$nickname" /></a> 120 <xsl:if test="../../@name = 'memberJoined' or ../../@name = 'memberParted'"> 121 <span class="hostmask"> 122 <xsl:text> (</xsl:text> 123 <xsl:value-of select="$hostmask" /> 124 <xsl:text>) </xsl:text> 125 </span> 126 </xsl:if> 127 </xsl:when> 128 <xsl:otherwise> 129 <a href="member:{$nickname}" class="member"><xsl:value-of select="$nickname" /></a> 130 </xsl:otherwise> 131 </xsl:choose> 110 132 </xsl:template> 111 133 trunk/Resources/styleOptions.plist
r2678 r3395 111 111 <dict> 112 112 <key>style</key> 113 <array> 114 <string>.hostmask { display: inline; }</string> 115 <string>.hostmask { display: none; }</string> 116 </array> 117 <key>default</key> 118 <integer>1</integer> 119 <key>description</key> 120 <string>Display hostmasks</string> 121 <key>type</key> 122 <string>list</string> 123 <key>options</key> 124 <array> 125 <string>Yes</string> 126 <string>No</string> 127 </array> 128 </dict> 129 <dict> 130 <key>style</key> 113 131 <string>.searchHighlight { color: %@ !important; }</string> 114 132 <key>default</key>
