From 3e69b721ca5e9b30cbfccd85c818d43aff94f293 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 14 Nov 2011 11:37:41 +0100 Subject: [PATCH] communitihome: fix login form in aside --- communityhome/communityhome.css | 23 ++++++++++- communityhome/communityhome.php | 43 ++++++++++---------- communityhome/communityhome.tpl | 70 +++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 communityhome/communityhome.tpl diff --git a/communityhome/communityhome.css b/communityhome/communityhome.css index a031e176e..2efb6ebd5 100644 --- a/communityhome/communityhome.css +++ b/communityhome/communityhome.css @@ -1,3 +1,21 @@ +aside form { position: relative } +aside #login_standard { + width: 200px; + position: absolute; + float:none; + height: 100px; + display: block; +} +aside #login_openid { + width: 200px; + position: absolute; + float:none; + margin-left: 0px; + height: 100px; + display: none; +} + + aside #label-login-name, aside #login-name, aside #label-login-password, @@ -14,8 +32,11 @@ aside #login-extra-filler { } aside #login-submit-button { margin-left: 100px; } aside .items-wrapper, -aside #login-extra-links { overflow: auto; width: 100%; } +aside #login-extra-links { overflow: auto; width: 100%;} aside .directory-item { width: 55px; height: 55px; vertical-align: center; text-align: center; } aside .directory-photo { margin: 0px; } aside .directory-photo-img { max-width: 48px; max-height: 48px; } aside #likes { margin: 0px; padding: 0px; list-style: none; } + + +aside #login-extra-links { overflow: auto; width: 100%; padding-top:120px;} diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 8020d82b7..8f0aa8675 100644 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -24,12 +24,19 @@ function communityhome_home(&$a, &$o){ // custom css $a->page['htmlhead'] .= ''; + $aside = array( + '$tab_1' => t('Login'), + '$tab_2' => t('OpenID'), + '$noOid' => get_config('system','no_openid'), + ); + // login form - $aside .= "

". t('Login'). "

"; - $aside .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); + $aside['$login_title'] = t('Login'); + $aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); // last 12 users - $aside .= "

". t('Last users'). "

"; + $aside['$lastusers_title'] = t('Last users'); + $aside['$lastusers_items'] = array(); $sql_extra = ""; $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); $order = " ORDER BY `register_date` DESC "; @@ -40,7 +47,6 @@ function communityhome_home(&$a, &$o){ 0, 12 ); - $aside .= "
"; $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); if(count($r)) { $photo = 'thumb'; @@ -52,10 +58,9 @@ function communityhome_home(&$a, &$o){ '$photo' => $rr[$photo], '$alt-text' => $rr['name'], )); - $aside .= $entry; + $aside['$lastusers_items'][] = $entry; } } - $aside .= "
"; // 12 most active users (by posts and contacts) // this query don't work on some mysql versions @@ -73,8 +78,8 @@ function communityhome_home(&$a, &$o){ ORDER BY `items` DESC,`contacts` DESC LIMIT 0,10"); if($r && count($r)) { - $aside .= "

". t('Most active users'). "

"; - $aside .= "
"; + $aside['$activeusers_title'] = t('Most active users'); + $aside['$activeusers_items'] = array(); $photo = 'thumb'; foreach($r as $rr) { @@ -85,13 +90,13 @@ function communityhome_home(&$a, &$o){ '$photo' => $rr[$photo], '$alt-text' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0')) )); - $aside .= $entry; + $aside['$activeusers_items'][] = $entry; } - $aside .= "
"; } // last 12 photos - $aside .= "

". t('Last photos'). "

"; + $aside['$photos_title'] = t('Last photos'); + $aside['$photos_items'] = array(); $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') @@ -106,7 +111,7 @@ function communityhome_home(&$a, &$o){ dbesc(t('Profile Photos')) ); - $aside .= "
"; + if(count($r)) { $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); foreach($r as $rr) { @@ -120,13 +125,13 @@ function communityhome_home(&$a, &$o){ '$alt-text' => $rr['username']." : ".$rr['desc'], )); - $aside .= $entry; + $aside['$photos_items'][] = $entry; } } - $aside .= "
"; // last 10 liked items - $aside .= "

". t('Last likes'). "

"; + $aside['$like_title'] = t('Last likes'); + $aside['$like_items'] = array(); $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 @@ -138,7 +143,6 @@ function communityhome_home(&$a, &$o){ $a->get_baseurl(),$a->get_baseurl() ); - $aside .= ""; - - $a->page['aside'] = $aside; + $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); + $a->page['aside'] = replace_macros($tpl, $aside); $o = '

' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '

'; diff --git a/communityhome/communityhome.tpl b/communityhome/communityhome.tpl new file mode 100644 index 000000000..846878097 --- /dev/null +++ b/communityhome/communityhome.tpl @@ -0,0 +1,70 @@ + +{{ if $noOid }} +

$login_title

+{{ else }} + +{{ endif }} +$login_form + + +{{ if $lastusers_title }} +

$lastusers_title

+
+{{ for $lastusers_items as $i }} + $i +{{ endfor }} +
+{{ endif }} + + +{{ if $activeusers_title }} +

$activeusers_title

+
+{{ for $activeusers_items as $i }} + $i +{{ endfor }} +
+{{ endif }} + +{{ if $photos_title }} +

$photos_title

+
+{{ for $photos_items as $i }} + $i +{{ endfor }} +
+{{ endif }} + + +{{ if $like_title }} +

$like_title

+ +{{ endif }}