diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /view/pdl | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'view/pdl')
| -rw-r--r-- | view/pdl/mod_channel.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_chat.pdl | 2 | ||||
| -rw-r--r-- | view/pdl/mod_network.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_new_channel.pdl | 2 | ||||
| -rw-r--r-- | view/pdl/mod_register.pdl | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl index dde8830ee..6cbc0c0e4 100644 --- a/view/pdl/mod_channel.pdl +++ b/view/pdl/mod_channel.pdl @@ -4,3 +4,4 @@ [widget=categories][/widget] [widget=tagcloud_wall][var=limit]24[/var][/widget] [/region] + diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index 6b1d2a15e..cdc66dd3d 100644 --- a/view/pdl/mod_chat.pdl +++ b/view/pdl/mod_chat.pdl @@ -1,3 +1,5 @@ [region=aside] [widget=profile][/widget] +[widget=bookmarkedchats][/widget] +[widget=suggestedchats][/widget] [/region] diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 7624ace01..11cadb5aa 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -12,4 +12,5 @@ [region=content] [widget=affinity][/widget] $content -[/region]
\ No newline at end of file +[/region] + diff --git a/view/pdl/mod_new_channel.pdl b/view/pdl/mod_new_channel.pdl index 733bc248a..90026f7fe 100644 --- a/view/pdl/mod_new_channel.pdl +++ b/view/pdl/mod_new_channel.pdl @@ -1 +1 @@ -[layout]full[/layout] +[template]full[/template] diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl index 733bc248a..90026f7fe 100644 --- a/view/pdl/mod_register.pdl +++ b/view/pdl/mod_register.pdl @@ -1 +1 @@ -[layout]full[/layout] +[template]full[/template] |