diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
| commit | 629a66793c245d39ca47523a6fbc790fae0cbe3b (patch) | |
| tree | e1714c8fca95087ff97a844688c40ade60c3b8ef /view/theme/diabook-blue | |
| parent | 2147ffa48734e50c9df1ea91ce100bf5336eacc2 (diff) | |
| parent | 37f02424f801b3132b75b39d4132f35025667a75 (diff) | |
| download | volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.gz volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.bz2 volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
small fix
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
position the theme-preview on settings page
more wordsmithing of the Friendica invitation email
screenshot gallery
theme preview for end users
* master:
Diffstat (limited to 'view/theme/diabook-blue')
| -rwxr-xr-x | view/theme/diabook-blue/communityhome.tpl | 2 | ||||
| -rwxr-xr-x | view/theme/diabook-blue/theme.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 5b807c8ad..5bae06178 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -46,7 +46,7 @@ </div> {{ endif }} -{{ if $lastusers_title }} +{{ if $page }} <div>$page</div> {{ endif }} diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 2c878e6f0..a5f4490ba 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -18,7 +18,7 @@ $cssFile = null; /** * prints last community activity */ -function diabook_community_info(){ +function diabook_blue_community_info(){ $a = get_app(); //right_aside at networkpages @@ -170,6 +170,7 @@ function diabook_community_info(){ if (sizeof($contacts) > 0) $aside['$page'] = $page; + //END Community Page @@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){ } // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css"; @@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){ if ($a->argv[0] === "profile"){ // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css"; |