add profile tabs to "photos", "events" and "notes". in dispy, show active tab.
This commit is contained in:
parent
aa4636d03a
commit
5de7d0f12f
|
@ -103,8 +103,23 @@ function events_content(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$o ="";
|
||||||
|
// tabs
|
||||||
|
$tpl = get_markup_template('profile_tabs.tpl');
|
||||||
|
$o .= replace_macros($tpl,array(
|
||||||
|
'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
||||||
|
'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
|
||||||
|
'$status' => t('Status'),
|
||||||
|
'$profile' => t('Profile'),
|
||||||
|
'$photos' => t('Photos'),
|
||||||
|
'$events' => t('Events') ,
|
||||||
|
'$notes' => t('Personal Notes'),
|
||||||
|
'$activetab' => "events",
|
||||||
|
));
|
||||||
|
|
||||||
$o .= '<h2>' . t('Events') . '</h2>';
|
$o .= '<h2>' . t('Events') . '</h2>';
|
||||||
|
|
||||||
|
|
||||||
$mode = 'view';
|
$mode = 'view';
|
||||||
$y = 0;
|
$y = 0;
|
||||||
$m = 0;
|
$m = 0;
|
||||||
|
|
|
@ -37,6 +37,20 @@ function notes_content(&$a) {
|
||||||
|
|
||||||
$is_owner = true;
|
$is_owner = true;
|
||||||
|
|
||||||
|
$o ="";
|
||||||
|
// tabs
|
||||||
|
$tpl = get_markup_template('profile_tabs.tpl');
|
||||||
|
$o .= replace_macros($tpl,array(
|
||||||
|
'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
||||||
|
'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
|
||||||
|
'$status' => t('Status'),
|
||||||
|
'$profile' => t('Profile'),
|
||||||
|
'$photos' => t('Photos'),
|
||||||
|
'$events' => t('Events') ,
|
||||||
|
'$notes' => t('Personal Notes'),
|
||||||
|
'$activetab' => "notes",
|
||||||
|
));
|
||||||
|
|
||||||
|
|
||||||
$o .= '<h3>' . t('Personal Notes') . '</h3>';
|
$o .= '<h3>' . t('Personal Notes') . '</h3>';
|
||||||
|
|
||||||
|
|
|
@ -80,15 +80,15 @@ EOT;
|
||||||
|
|
||||||
function photos_post(&$a) {
|
function photos_post(&$a) {
|
||||||
|
|
||||||
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
|
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
|
||||||
|
|
||||||
foreach($_REQUEST AS $key => $val) {
|
foreach($_REQUEST AS $key => $val) {
|
||||||
logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
|
logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($_FILES AS $key => $val) {
|
foreach($_FILES AS $key => $val) {
|
||||||
logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
|
logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
|
||||||
}
|
}
|
||||||
|
|
||||||
$can_post = false;
|
$can_post = false;
|
||||||
$visitor = 0;
|
$visitor = 0;
|
||||||
|
@ -836,6 +836,22 @@ function photos_content(&$a) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$o = "";
|
||||||
|
|
||||||
|
// tabs
|
||||||
|
$tpl = get_markup_template('profile_tabs.tpl');
|
||||||
|
$_is_owner = (local_user() && (local_user() == $owner_uid));
|
||||||
|
$o .= replace_macros($tpl,array(
|
||||||
|
'$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
|
||||||
|
'$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
|
||||||
|
'$status' => t('Status'),
|
||||||
|
'$profile' => t('Profile'),
|
||||||
|
'$photos' => t('Photos'),
|
||||||
|
'$events' => (($_is_owner) ? t('Events') : ''),
|
||||||
|
'$notes' => (($_is_owner) ? t('Personal Notes') : ''),
|
||||||
|
'$activetab' => "photos",
|
||||||
|
));
|
||||||
|
|
||||||
//
|
//
|
||||||
// dispatch request
|
// dispatch request
|
||||||
//
|
//
|
||||||
|
@ -968,7 +984,7 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$o = '';
|
//$o = '';
|
||||||
// fetch image, item containing image, then comments
|
// fetch image, item containing image, then comments
|
||||||
|
|
||||||
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
|
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
|
||||||
|
@ -1319,7 +1335,7 @@ function photos_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default - show recent photos with upload link (if applicable)
|
// Default - show recent photos with upload link (if applicable)
|
||||||
$o = '';
|
//$o = '';
|
||||||
|
|
||||||
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s'
|
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s'
|
||||||
$sql_extra GROUP BY `resource-id`",
|
$sql_extra GROUP BY `resource-id`",
|
||||||
|
|
|
@ -116,8 +116,9 @@ function profile_content(&$a, $update = 0) {
|
||||||
'$status' => t('Status'),
|
'$status' => t('Status'),
|
||||||
'$profile' => t('Profile'),
|
'$profile' => t('Profile'),
|
||||||
'$photos' => t('Photos'),
|
'$photos' => t('Photos'),
|
||||||
'$events' => (($is_owner) ? '<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
|
'$events' => (($is_owner) ? t('Events') : ''),
|
||||||
'$notes' => (($is_owner) ? '<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
|
'$notes' => (($is_owner) ? t('Personal Notes') : ''),
|
||||||
|
'$activetab' => $tab,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
|
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
|
||||||
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
|
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
|
||||||
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
|
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
|
||||||
$events
|
{{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs" >$events</a>{{ endif }}
|
||||||
$notes
|
{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >$notes</a>{{ endif }}
|
||||||
<div id="profile-tabs-end"></div>
|
<div id="profile-tabs-end"></div>
|
||||||
</div>
|
</div>
|
|
@ -1,7 +1,9 @@
|
||||||
|
|
||||||
<div class="tabs-wrapper" >
|
<div class="tabs-wrapper" >
|
||||||
<a href="$url" id="profile-tab-status-link" class="tabs" >$status</a>
|
<a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
|
||||||
<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs" >$profile</a>
|
<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
|
||||||
<a href="$phototab" id="profile-tab-photos-link" class="tabs" >$photos</a>
|
<a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
|
||||||
|
{{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
|
||||||
|
{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}
|
||||||
<div class="tabs-end"></div>
|
<div class="tabs-end"></div>
|
||||||
</div>
|
</div>
|
|
@ -371,6 +371,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
|
||||||
.tabs-wrapper li { display: inline;}
|
.tabs-wrapper li { display: inline;}
|
||||||
.tabs { padding: 0px 5px; margin-right: 10px; }
|
.tabs { padding: 0px 5px; margin-right: 10px; }
|
||||||
.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
|
.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
|
||||||
|
.tabs.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue