diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-13 19:26:18 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-13 19:26:18 -0400 |
| commit | a3d95f79f27ca73d657907ab42b51ecc50872089 (patch) | |
| tree | 74865c7ef150c0d92485f9ec1b1dd204175e34ca /view/theme/quattro/conversation.tpl | |
| parent | 093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc (diff) | |
| parent | bfb821e9188ef83fb2621250fd97bdb169447f3d (diff) | |
| download | volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.tar.gz volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.tar.bz2 volse-hubzilla-a3d95f79f27ca73d657907ab42b51ecc50872089.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
well that was a silly mistake...
setting wasn't being applied
rev update
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
diabook: theme-settings: users can set font-size and line-height for posts and comments
diabook-themes: small fixes
quattro: language icon in navbar
move html out of lang_selector() and new template lang_selector.tpl
display settings: show theme screenshot on page load
quattro: add admin theme settigs. darker items background with a bottom border.
admin: change global theme settings
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
validate_url allow naked subdomain if is "localhost"
* master:
Diffstat (limited to 'view/theme/quattro/conversation.tpl')
| -rw-r--r-- | view/theme/quattro/conversation.tpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..7bb7cd2fd 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -9,8 +9,11 @@ {{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}} - {{ inc $item.template }}{{ endinc }} - + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} {{ endfor }} </div> |