diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-01 00:49:42 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-01 00:49:42 -0400 |
| commit | 46558e98a8282f2a2e12f5dbcfdbd39f139be9bb (patch) | |
| tree | 8553a554618de8ab99a92e2969f120dfffbb9fe8 /view/theme/diabook/communityhome.tpl | |
| parent | 9b7dac6ce19e99ae9341329f422685626146fbdb (diff) | |
| parent | 2c577ed90f1d6a459d7c4b84db3ffd1f5d052ff8 (diff) | |
| download | volse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.tar.gz volse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.tar.bz2 volse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: add "community profiles"-box to right_column
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
rev update
start adding tooltips to tab menus
fix join group notifications
* master:
Diffstat (limited to 'view/theme/diabook/communityhome.tpl')
| -rwxr-xr-x | view/theme/diabook/communityhome.tpl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 66f93c32d..982e2bd26 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -4,9 +4,20 @@ {{ endif }} </div> +<div id="close_profiles"> +{{ if $comunity_profilest_title }} +<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="close"></a></h3> +<div id='lastusers-wrapper' class='items-wrapper'> +{{ for $comunity_profiles_items as $i }} + $i +{{ endfor }} +</div> +{{ endif }} +</div> + <div id="close_helpers"> {{ if $lastusers_title }} -<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3> +<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3> <a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br> @@ -42,6 +53,9 @@ $nv.search {{ endif }} </div> +<div id="twitter"> +</div> + <div id="close_lastusers"> {{ if $lastusers_title }} <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3> |