really commiting files this time, still getting the hang of git.
some images added, some classes added to groupidebar, contacts sidebar notification flags moved out of nav and into banner for testbubble the testbubble css tweaks
This commit is contained in:
Devlon Duthie
parent
634e52a671
commit
cb1c6dd1e3
Binary file not shown.
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 211 B |
Binary file not shown.
|
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 236 B |
|
|
@ -167,7 +167,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
|
|||
$selected = (($group_id == 0) ? ' group-selected' : '');
|
||||
$o .= <<< EOT
|
||||
|
||||
<div id="group-sidebar">
|
||||
<div id="group-sidebar" class="widget">
|
||||
<h3>Groups</h3>
|
||||
|
||||
<div id="sidebar-group-list">
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ if($a->profile['name']) {
|
|||
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-name-wrapper" >
|
||||
<div id="advanced-profile-name-text">$lbl_fullname</div>
|
||||
<div id="advanced-profile-name">$fullname</div>
|
||||
<div id="advanced-profile-name-text" class="advanced-profile-label">$lbl_fullname</div>
|
||||
<div id="advanced-profile-name" class="advanced-profile-content">$fullname</div>
|
||||
</div>
|
||||
<div id="advanced-profile-name-end"></div>
|
||||
EOT;
|
||||
|
|
@ -25,8 +25,8 @@ if($a->profile['gender']) {
|
|||
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-gender-wrapper" >
|
||||
<div id="advanced-profile-gender-text">$lbl_gender</div>
|
||||
<div id="advanced-profile-gender">$gender</div>
|
||||
<div id="advanced-profile-gender-text" class="advanced-profile-label">$lbl_gender</div>
|
||||
<div id="advanced-profile-gender" class="advanced-profile-content">$gender</div>
|
||||
</div>
|
||||
<div id="advanced-profile-gender-end"></div>
|
||||
EOT;
|
||||
|
|
@ -37,7 +37,7 @@ if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
|
|||
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-dob-wrapper" >
|
||||
<div id="advanced-profile-dob-text">$lbl_birthday</div>
|
||||
<div id="advanced-profile-dob-text" class="advanced-profile-label">$lbl_birthday</div>
|
||||
EOT;
|
||||
|
||||
// If no year, add an arbitrary one so just we can parse the month and day.
|
||||
|
|
@ -45,7 +45,7 @@ EOT;
|
|||
$year_bd_format = t('j F, Y');
|
||||
$short_bd_format = t('j F');
|
||||
|
||||
$o .= '<div id="advanced-profile-dob">'
|
||||
$o .= '<div id="advanced-profile-dob" class="advanced-profile-content">'
|
||||
. ((intval($a->profile['dob']))
|
||||
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
|
||||
: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format)))
|
||||
|
|
@ -59,8 +59,8 @@ if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
|
|||
$lbl_age = t('Age:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-age-wrapper" >
|
||||
<div id="advanced-profile-age-text">$lbl_age</div>
|
||||
<div id="advanced-profile-age">$age</div>
|
||||
<div id="advanced-profile-age-text" class="advanced-profile-label">$lbl_age</div>
|
||||
<div id="advanced-profile-age" class="advanced-profile-content">$age</div>
|
||||
</div>
|
||||
<div id="advanced-profile-age-end"></div>
|
||||
EOT;
|
||||
|
|
@ -72,8 +72,8 @@ if($a->profile['marital']) {
|
|||
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-marital-wrapper" >
|
||||
<div id="advanced-profile-marital-text">$lbl_marital</div>
|
||||
<div id="advanced-profile-marital">$marital</div>
|
||||
<div id="advanced-profile-marital-text" class="advanced-profile-label">$lbl_marital</div>
|
||||
<div id="advanced-profile-marital" class="advanced-profile-content">$marital</div>
|
||||
EOT;
|
||||
|
||||
if($a->profile['with']) {
|
||||
|
|
@ -92,8 +92,8 @@ if($a->profile['sexual']) {
|
|||
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-sexual-wrapper" >
|
||||
<div id="advanced-profile-sexual-text">$lbl_sexual</div>
|
||||
<div id="advanced-profile-sexual">$sexual</div>
|
||||
<div id="advanced-profile-sexual-text" class="advanced-profile-label">$lbl_sexual</div>
|
||||
<div id="advanced-profile-sexual" class="advanced-profile-content">$sexual</div>
|
||||
</div>
|
||||
<div id="advanced-profile-sexual-end"></div>
|
||||
EOT;
|
||||
|
|
@ -104,8 +104,8 @@ if($a->profile['homepage']) {
|
|||
$homepage = linkify($a->profile['homepage']);
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-homepage-wrapper" >
|
||||
<div id="advanced-profile-homepage-text">$lbl_homepage</div>
|
||||
<div id="advanced-profile-homepage">$homepage</div>
|
||||
<div id="advanced-profile-homepage-text" class="advanced-profile-label">$lbl_homepage</div>
|
||||
<div id="advanced-profile-homepage" class="advanced-profile-content">$homepage</div>
|
||||
</div>
|
||||
<div id="advanced-profile-homepage-end"></div>
|
||||
EOT;
|
||||
|
|
@ -116,8 +116,8 @@ if($a->profile['politic']) {
|
|||
$politic = $a->profile['politic'];
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-politic-wrapper" >
|
||||
<div id="advanced-profile-politic-text">$lbl_politic</div>
|
||||
<div id="advanced-profile-politic">$politic</div>
|
||||
<div id="advanced-profile-politic-text" class="advanced-profile-label">$lbl_politic</div>
|
||||
<div id="advanced-profile-politic" class="advanced-profile-content">$politic</div>
|
||||
</div>
|
||||
<div id="advanced-profile-politic-end"></div>
|
||||
EOT;
|
||||
|
|
@ -128,8 +128,8 @@ if($a->profile['religion']) {
|
|||
$religion = $a->profile['religion'];
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-religion-wrapper" >
|
||||
<div id="advanced-profile-religion-text">$lbl_religion</div>
|
||||
<div id="advanced-profile-religion">$religion</div>
|
||||
<div id="advanced-profile-religion-text" class="advanced-profile-label">$lbl_religion</div>
|
||||
<div id="advanced-profile-religion" class="advanced-profile-content">$religion</div>
|
||||
</div>
|
||||
<div id="advanced-profile-religion-end"></div>
|
||||
EOT;
|
||||
|
|
@ -138,9 +138,9 @@ if($txt = prepare_text($a->profile['about'])) {
|
|||
$lbl_about = t('About:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-about-wrapper" >
|
||||
<div id="advanced-profile-about-text">$lbl_about</div>
|
||||
<div id="advanced-profile-about-text" class="advanced-profile-label">$lbl_about</div>
|
||||
<br />
|
||||
<div id="advanced-profile-about">$txt</div>
|
||||
<div id="advanced-profile-about" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-about-end"></div>
|
||||
EOT;
|
||||
|
|
@ -150,9 +150,9 @@ if($txt = prepare_text($a->profile['interest'])) {
|
|||
$lbl_interests = t('Hobbies/Interests:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-interest-wrapper" >
|
||||
<div id="advanced-profile-interest-text">$lbl_interests</div>
|
||||
<div id="advanced-profile-interest-text" class="advanced-profile-label">$lbl_interests</div>
|
||||
<br />
|
||||
<div id="advanced-profile-interest">$txt</div>
|
||||
<div id="advanced-profile-interest" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-interest-end"></div>
|
||||
EOT;
|
||||
|
|
@ -162,9 +162,9 @@ if($txt = prepare_text($a->profile['contact'])) {
|
|||
$lbl_contact = t('Contact information and Social Networks:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-contact-wrapper" >
|
||||
<div id="advanced-profile-contact-text">$lbl_contact</div>
|
||||
<div id="advanced-profile-contact-text" class="advanced-profile-label">$lbl_contact</div>
|
||||
<br />
|
||||
<div id="advanced-profile-contact">$txt</div>
|
||||
<div id="advanced-profile-contact" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-contact-end"></div>
|
||||
EOT;
|
||||
|
|
@ -174,9 +174,9 @@ if($txt = prepare_text($a->profile['music'])) {
|
|||
$lbl_music = t('Musical interests:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-music-wrapper" >
|
||||
<div id="advanced-profile-music-text">$lbl_music</div>
|
||||
<div id="advanced-profile-music-text" class="advanced-profile-label">$lbl_music</div>
|
||||
<br />
|
||||
<div id="advanced-profile-music">$txt</div>
|
||||
<div id="advanced-profile-music" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-music-end"></div>
|
||||
EOT;
|
||||
|
|
@ -186,9 +186,9 @@ if($txt = prepare_text($a->profile['book'])) {
|
|||
$lbl_book = t('Books, literature:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-book-wrapper" >
|
||||
<div id="advanced-profile-book-text">$lbl_book</div>
|
||||
<div id="advanced-profile-book-text" class="advanced-profile-label">$lbl_book</div>
|
||||
<br />
|
||||
<div id="advanced-profile-book">$txt</div>
|
||||
<div id="advanced-profile-book" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-book-end"></div>
|
||||
EOT;
|
||||
|
|
@ -198,9 +198,9 @@ if($txt = prepare_text($a->profile['tv'])) {
|
|||
$lbl_tv = t('Television:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-tv-wrapper" >
|
||||
<div id="advanced-profile-tv-text">$lbl_tv</div>
|
||||
<div id="advanced-profile-tv-text" class="advanced-profile-label">$lbl_tv</div>
|
||||
<br />
|
||||
<div id="advanced-profile-tv">$txt</div>
|
||||
<div id="advanced-profile-tv" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-tv-end"></div>
|
||||
EOT;
|
||||
|
|
@ -210,9 +210,9 @@ if($txt = prepare_text($a->profile['film'])) {
|
|||
$lbl_film = t('Film/dance/culture/entertainment:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-film-wrapper" >
|
||||
<div id="advanced-profile-film-text">$lbl_film</div>
|
||||
<div id="advanced-profile-film-text" class="advanced-profile-label">$lbl_film</div>
|
||||
<br />
|
||||
<div id="advanced-profile-film">$txt</div>
|
||||
<div id="advanced-profile-film" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-film-end"></div>
|
||||
EOT;
|
||||
|
|
@ -222,9 +222,9 @@ if($txt = prepare_text($a->profile['romance'])) {
|
|||
$lbl_romance = t('Love/Romance:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-romance-wrapper" >
|
||||
<div id="advanced-profile-romance-text">$lbl_romance</div>
|
||||
<div id="advanced-profile-romance-text" class="advanced-profile-label">$lbl_romance</div>
|
||||
<br />
|
||||
<div id="advanced-profile-romance">$txt</div>
|
||||
<div id="advanced-profile-romance" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-romance-end"></div>
|
||||
EOT;
|
||||
|
|
@ -234,9 +234,9 @@ if($txt = prepare_text($a->profile['work'])) {
|
|||
$lbl_work = t('Work/employment:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-work-wrapper" >
|
||||
<div id="advanced-profile-work-text">$lbl_work</div>
|
||||
<div id="advanced-profile-work-text" class="advanced-profile-label">$lbl_work</div>
|
||||
<br />
|
||||
<div id="advanced-profile-work">$txt</div>
|
||||
<div id="advanced-profile-work" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-work-end"></div>
|
||||
EOT;
|
||||
|
|
@ -246,9 +246,9 @@ if($txt = prepare_text($a->profile['education'])) {
|
|||
$lbl_education = t('School/education:');
|
||||
$o .= <<< EOT
|
||||
<div id="advanced-profile-education-wrapper" >
|
||||
<div id="advanced-profile-education-text">$lbl_education</div>
|
||||
<div id="advanced-profile-education-text" class="advanced-profile-label">$lbl_education</div>
|
||||
<br />
|
||||
<div id="advanced-profile-education">$txt</div>
|
||||
<div id="advanced-profile-education" class="advanced-profile-content">$txt</div>
|
||||
</div>
|
||||
<div id="advanced-profile-education-end"></div>
|
||||
EOT;
|
||||
|
|
|
|||
|
|
@ -36,15 +36,16 @@ function contacts_init(&$a) {
|
|||
elseif($a->config['register_policy'] != REGISTER_CLOSED)
|
||||
$a->page['aside'] .= $inv;
|
||||
|
||||
|
||||
$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >'
|
||||
. t('Find People With Shared Interests') . '</a></div>';
|
||||
|
||||
$tpl = get_markup_template('follow.tpl');
|
||||
|
||||
$findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >'
|
||||
. t('Similar Interests') . '</a></div>';
|
||||
|
||||
$a->page['aside'] .= replace_macros($tpl,array(
|
||||
'$label' => t('Connect/Follow'),
|
||||
'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
|
||||
'$follow' => t('Follow')
|
||||
'$follow' => t('Follow'),
|
||||
'$findSimilar' => $findSimilarLink
|
||||
));
|
||||
|
||||
|
||||
|
|
|
|||
118
mod/network.php
118
mod/network.php
|
|
@ -17,11 +17,11 @@ function network_init(&$a) {
|
|||
|
||||
// We need a better way of managing a growing argument list
|
||||
|
||||
$srchurl = '/network'
|
||||
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
||||
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
|
||||
. ((x($_GET,'order')) ? '?order=' . $_GET['order'] : '')
|
||||
. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
|
||||
// moved into savedsearches()
|
||||
// $srchurl = '/network'
|
||||
// . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
||||
// . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
|
||||
// . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
|
||||
|
||||
if(x($_GET,'save')) {
|
||||
$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
|
||||
|
|
@ -42,53 +42,85 @@ function network_init(&$a) {
|
|||
);
|
||||
}
|
||||
|
||||
$a->page['aside'] .= search($search,'netsearch-box',$srchurl,true);
|
||||
// item filter tabs
|
||||
// TODO: fix this logic, reduce duplication
|
||||
$a->page['content'] .= '<div class="tabs-wrapper">';
|
||||
|
||||
$a->page['aside'] .= '<div id="network-new-link">';
|
||||
$starred_active = '';
|
||||
$new_active = '';
|
||||
$bookmarked_active = '';
|
||||
$all_active = '';
|
||||
$search_active = '';
|
||||
|
||||
|
||||
$a->page['aside'] .= '<div id="network-view-link">';
|
||||
if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) {
|
||||
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>';
|
||||
if(($a->argc > 1 && $a->argv[1] === 'new')
|
||||
|| ($a->argc > 2 && $a->argv[2] === 'new')) {
|
||||
$new_active = 'active';
|
||||
}
|
||||
else {
|
||||
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>';
|
||||
|
||||
if(x($_GET,'star'))
|
||||
$a->page['aside'] .= '<div id="network-star-link">'
|
||||
. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd
|
||||
if(x($_GET,'search')) {
|
||||
$search_active = 'active';
|
||||
}
|
||||
|
||||
if(x($_GET,'star')) {
|
||||
$starred_active = 'active';
|
||||
}
|
||||
|
||||
if($_GET['bmark']) {
|
||||
$bookmarked_active = 'active';
|
||||
}
|
||||
|
||||
if (($new_active == '')
|
||||
&& ($starred_active == '')
|
||||
&& ($bookmarked_active == '')
|
||||
&& ($search_active == '')) {
|
||||
$all_active = 'active';
|
||||
}
|
||||
|
||||
// network links moved to content to match other pages
|
||||
// all
|
||||
$a->page['content'] .= '<a class="tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/'
|
||||
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">'
|
||||
. t('All') . '</a>';
|
||||
|
||||
// new
|
||||
$a->page['content'] .= '<a class="tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/'
|
||||
. str_replace('/new', '', $a->cmd) . '/new'
|
||||
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">'
|
||||
. t('View Any Items') . '</a>'
|
||||
. '<span class="network-star icon starred"></span>'
|
||||
. '<span class="network-star icon unstarred"></span>'
|
||||
. '<div class="clear"></div></div>';
|
||||
else
|
||||
$a->page['aside'] .= '<div id="network-star-link">'
|
||||
. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd
|
||||
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >'
|
||||
. t('View Starred Items') . '</a>'
|
||||
. '<span class="network-star icon starred"></span>'
|
||||
. '<div class="clear"></div></div>';
|
||||
. t('New') . '</a>';
|
||||
|
||||
if(! $_GET['bmark'])
|
||||
$a->page['aside'] .= '<div id="network-bmark-link">'
|
||||
. '<a class="network-bmark" href="' . $a->get_baseurl() . '/' . $a->cmd
|
||||
. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >'
|
||||
. t('View Bookmarks') . '</a>'
|
||||
. '<div class="clear"></div></div>';
|
||||
// starred
|
||||
$a->page['content'] .= '<a class="tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
|
||||
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >'
|
||||
. t('Starred') . '</a>';
|
||||
|
||||
// bookmarks
|
||||
$a->page['content'] .= '<a class="tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
|
||||
. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >'
|
||||
. t('Bookmarks') . '</a>';
|
||||
|
||||
$a->page['content'] .= '</div>';
|
||||
// --- end item filter tabs
|
||||
|
||||
// search terms header
|
||||
if(x($_GET,'search')) {
|
||||
$a->page['content'] .= '<h2>Search Results For: ' . $search . '</h2>';
|
||||
}
|
||||
|
||||
$a->page['aside'] .= '</div>';
|
||||
|
||||
$a->page['aside'] .= group_side('network','network',true,$group_id);
|
||||
|
||||
$a->page['aside'] .= saved_searches();
|
||||
// moved to saved searches to have it in the same div
|
||||
//$a->page['aside'] .= search($search,'netsearch-box',$srchurl,true);
|
||||
|
||||
$a->page['aside'] .= saved_searches($search);
|
||||
|
||||
}
|
||||
|
||||
function saved_searches() {
|
||||
function saved_searches($search) {
|
||||
|
||||
$srchurl = '/network'
|
||||
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
||||
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
|
||||
. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
|
||||
|
||||
$o = '';
|
||||
|
||||
|
|
@ -96,22 +128,24 @@ function saved_searches() {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
$o .= '<div id="saved-search-list" class="widget">';
|
||||
$o .= '<h3 id="search">' . t('Saved Searches') . '</h3>' . "\r\n";
|
||||
$o .= search($search,'netsearch-box',$srchurl,true);
|
||||
|
||||
if(count($r)) {
|
||||
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
|
||||
$o .= '<div id="saved-search-list"><ul id="saved-search-ul">' . "\r\n";
|
||||
$o .= '<ul id="saved-search-ul">' . "\r\n";
|
||||
foreach($r as $rr) {
|
||||
$o .= '<li class="saved-search-li clear"><a href="network/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="network/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
|
||||
}
|
||||
$o .= '</ul></div>' . "\r\n";
|
||||
$o .= '</ul>';
|
||||
}
|
||||
|
||||
$o .= '</div>' . "\r\n";
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function network_content(&$a, $update = 0) {
|
||||
|
||||
require_once('include/conversation.php');
|
||||
|
|
|
|||
|
|
@ -33,10 +33,13 @@ function photos_init(&$a) {
|
|||
if(count($albums)) {
|
||||
$a->data['albums'] = $albums;
|
||||
|
||||
$o .= '<h4><a href="' . $a->get_baseurl() . '/profile/' . $a->data['user']['nickname'] . '">' . $a->data['user']['username'] . '</a></h4>';
|
||||
$o .= '<div class="vcard">';
|
||||
$o .= '<div class="fn">' . $a->data['user']['username'] . '</h4>';
|
||||
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>';
|
||||
$o .= '</div>';
|
||||
|
||||
$o .= '<h4>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h4>';
|
||||
$o .= '<div id="side-bar-photos-albums" class="widget">';
|
||||
$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h4>';
|
||||
|
||||
$o .= '<ul>';
|
||||
foreach($albums as $album) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
<div class="side-follow-wrapper" id="side-follow-wrapper" >
|
||||
<form action="follow" method="post" />
|
||||
<label id="side-follow-label" for="side-follow-url" >$label</label>
|
||||
<input id="side-follow-url" type="text" name="url" size="24" title="$hint" />
|
||||
<div class="side-follow-input-end"></div>
|
||||
<input id="side-follow-submit" type="submit" name="submit" value="$follow" />
|
||||
</form>
|
||||
<div id="follow-sidebar" class="widget">
|
||||
<h3>Find People</h3>
|
||||
<form action="follow" method="post" />
|
||||
<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
|
||||
</form>
|
||||
$findSimilar
|
||||
</div>
|
||||
<div class="side-follow-end"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,13 @@ $langselector
|
|||
|
||||
<span id="banner">$banner</span>
|
||||
|
||||
<div id="notifications">
|
||||
{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
|
||||
{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
|
||||
{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
|
||||
{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
|
||||
</div>
|
||||
|
||||
<div id="user-menu" >
|
||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
|
||||
|
||||
|
|
@ -38,14 +45,6 @@ $langselector
|
|||
{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
|
||||
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
|
||||
</ul>
|
||||
|
||||
<div id="notifications">
|
||||
{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
|
||||
{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
|
||||
{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
|
||||
{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ Red links - #b20202
|
|||
Red link hover - #db0503
|
||||
Red Gradients (buttons and other gradients) - #b20202 and #d60808
|
||||
|
||||
Grey text - #626262
|
||||
Grey/body text - #626262
|
||||
Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
|
||||
|
||||
Dark Grey Gradients - #7c7d7b and #555753
|
||||
|
||||
You can switch out the colors of header, buttons and links by using a find and replace in your text editor.
|
||||
You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
|
||||
|
||||
= */
|
||||
/* ========== */
|
||||
|
|
@ -81,7 +81,6 @@ input[type=submit] {
|
|||
margin-top: 10px;
|
||||
border: none;
|
||||
font-size: 0.9em;
|
||||
display: inline;
|
||||
padding: 5px 5px 5px 5px;
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
|
|
@ -122,6 +121,10 @@ section {
|
|||
padding-right: 230px;
|
||||
}
|
||||
|
||||
#wall-item-lock {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
/* ========= */
|
||||
/* = Login = */
|
||||
/* ========= */
|
||||
|
|
@ -1216,7 +1219,8 @@ div[id$="wrapper"] br { clear: left; }
|
|||
float: left;
|
||||
display: inline;
|
||||
width: 130px;
|
||||
margin:20px;
|
||||
margin-left:5px;
|
||||
margin-top: 20px;
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
|
|
@ -1228,7 +1232,6 @@ div[id$="wrapper"] br { clear: left; }
|
|||
-webkit-border-radius:5px;
|
||||
border-radius:5px;
|
||||
padding: 5px 10px 5px 10px;
|
||||
margin-right: 5px;
|
||||
font-style: bold;
|
||||
color:#efefef;
|
||||
text-align: center;
|
||||
|
|
@ -1819,6 +1822,7 @@ input#photo_edit_form {
|
|||
font-size: 1em;
|
||||
}
|
||||
|
||||
|
||||
#prvmail-submit-wrapper { margin-top: 10px; }
|
||||
#prvmail-submit {
|
||||
float: right;
|
||||
|
|
@ -2527,27 +2531,35 @@ margin-left: 90px;
|
|||
display: inline;
|
||||
}
|
||||
#group-edit-submit-wrapper {
|
||||
margin-bottom: 0px;
|
||||
margin-bottom: 10px;
|
||||
margin-right: 400px;
|
||||
float: right;
|
||||
display: inline;
|
||||
}
|
||||
#group-delete-icon-11 { position: absolute; left: 360px; top: 103px; }
|
||||
#group-edit-desc { margin: 10px 0xp; }
|
||||
#group-new-text {font-size: 1.1em;}
|
||||
#group-members,
|
||||
#prof-members {
|
||||
width: 620px;
|
||||
width: 83%;
|
||||
height: 200px;
|
||||
overflow: auto;
|
||||
border: none;
|
||||
background-color: #fff;
|
||||
background-color: #f0edf0;
|
||||
color: #555753;
|
||||
border: 1px solid #ccc;
|
||||
margin-bottom: 10px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
#group-all-contacts,
|
||||
#prof-all-contacts {
|
||||
width: 620px;
|
||||
width: 83%;
|
||||
height: 200px;
|
||||
overflow: auto;
|
||||
border: none;
|
||||
border: 1px solid #ccc;
|
||||
background-color: #f0edf0;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
#group-members h3,
|
||||
|
|
@ -2578,7 +2590,7 @@ margin-left: 90px;
|
|||
width: 400px;
|
||||
padding: 20px;
|
||||
padding-top: 10px;
|
||||
margin: 0 50px;
|
||||
margin: 0 0px;
|
||||
background-color: #fff;
|
||||
-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
|
||||
-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
|
||||
|
|
@ -2644,7 +2656,6 @@ margin-left: 90px;
|
|||
#new-event-link{
|
||||
width: 130px;
|
||||
padding: 7px;
|
||||
margin: auto;
|
||||
margin-bottom: 10px;
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
|
|
@ -2854,6 +2865,8 @@ tr {
|
|||
|
||||
.admin.link {
|
||||
list-style-position: inside;
|
||||
font-size: 1em;
|
||||
padding: 3px;
|
||||
}
|
||||
|
||||
#adminpage dl {
|
||||
|
|
@ -2930,7 +2943,7 @@ tr {
|
|||
.field textarea { height: 100px; }
|
||||
.field_help {
|
||||
display: block;
|
||||
margin-left: 200px;
|
||||
margin-left: 100px;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue