diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/pdl | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/pdl')
| -rw-r--r-- | view/pdl/mod_cal.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_channel.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_chat.pdl | 4 | ||||
| -rw-r--r-- | view/pdl/mod_cloud.pdl | 2 | ||||
| -rw-r--r-- | view/pdl/mod_locs.pdl | 4 | ||||
| -rw-r--r-- | view/pdl/mod_new_channel.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_register.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_uexport.pdl | 4 |
8 files changed, 18 insertions, 4 deletions
diff --git a/view/pdl/mod_cal.pdl b/view/pdl/mod_cal.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_cal.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl index 6cbc0c0e4..98dc71915 100644 --- a/view/pdl/mod_channel.pdl +++ b/view/pdl/mod_channel.pdl @@ -1,3 +1,6 @@ +[region=banner] +[widget=cover_photo][/widget] +[/region] [region=aside] [widget=fullprofile][/widget] [widget=archive][var=wall]1[/var][/widget] diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index cdc66dd3d..664e77f53 100644 --- a/view/pdl/mod_chat.pdl +++ b/view/pdl/mod_chat.pdl @@ -1,5 +1,7 @@ [region=aside] -[widget=profile][/widget] +[widget=vcard][/widget] +[widget=chatroom_list][/widget] [widget=bookmarkedchats][/widget] [widget=suggestedchats][/widget] +[widget=chatroom_members][/widget] [/region] diff --git a/view/pdl/mod_cloud.pdl b/view/pdl/mod_cloud.pdl index 6b1d2a15e..d8f50ad7a 100644 --- a/view/pdl/mod_cloud.pdl +++ b/view/pdl/mod_cloud.pdl @@ -1,3 +1,3 @@ [region=aside] -[widget=profile][/widget] +[widget=vcard][/widget] [/region] diff --git a/view/pdl/mod_locs.pdl b/view/pdl/mod_locs.pdl new file mode 100644 index 000000000..0b0a99638 --- /dev/null +++ b/view/pdl/mod_locs.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=settings_menu][/widget] +[/region] + diff --git a/view/pdl/mod_new_channel.pdl b/view/pdl/mod_new_channel.pdl deleted file mode 100644 index 90026f7fe..000000000 --- a/view/pdl/mod_new_channel.pdl +++ /dev/null @@ -1 +0,0 @@ -[template]full[/template] diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl deleted file mode 100644 index 90026f7fe..000000000 --- a/view/pdl/mod_register.pdl +++ /dev/null @@ -1 +0,0 @@ -[template]full[/template] diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl new file mode 100644 index 000000000..0b0a99638 --- /dev/null +++ b/view/pdl/mod_uexport.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=settings_menu][/widget] +[/region] + |