friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-09-25 22:14:40 -07:00
commit 20d4fda22f
44 changed files with 5583 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/larrow.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 211 B

BIN
images/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
images/lrarrow.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

2
include/group.php
View file

@ -167,7 +167,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$selected = (($group_id == 0) ? ' group-selected' : ''); $selected = (($group_id == 0) ? ' group-selected' : '');
$o .= <<< EOT $o .= <<< EOT
<div id="group-sidebar"> <div id="group-sidebar" class="widget">
<h3>Groups</h3> <h3>Groups</h3>
<div id="sidebar-group-list"> <div id="sidebar-group-list">

76
include/profile_advanced.php
View file

@ -12,8 +12,8 @@ if($a->profile['name']) {
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-name-wrapper" > <div id="advanced-profile-name-wrapper" >
<div id="advanced-profile-name-text">$lbl_fullname</div> <div id="advanced-profile-name-text" class="advanced-profile-label">$lbl_fullname</div>
<div id="advanced-profile-name">$fullname</div> <div id="advanced-profile-name" class="advanced-profile-content">$fullname</div>
</div> </div>
<div id="advanced-profile-name-end"></div> <div id="advanced-profile-name-end"></div>
EOT; EOT;
@ -25,8 +25,8 @@ if($a->profile['gender']) {
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-gender-wrapper" > <div id="advanced-profile-gender-wrapper" >
<div id="advanced-profile-gender-text">$lbl_gender</div> <div id="advanced-profile-gender-text" class="advanced-profile-label">$lbl_gender</div>
<div id="advanced-profile-gender">$gender</div> <div id="advanced-profile-gender" class="advanced-profile-content">$gender</div>
</div> </div>
<div id="advanced-profile-gender-end"></div> <div id="advanced-profile-gender-end"></div>
EOT; EOT;
@ -37,7 +37,7 @@ if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-dob-wrapper" > <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; EOT;
// If no year, add an arbitrary one so just we can parse the month and day. // 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'); $year_bd_format = t('j F, Y');
$short_bd_format = t('j F'); $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'])) . ((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',$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))) : 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:'); $lbl_age = t('Age:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-age-wrapper" > <div id="advanced-profile-age-wrapper" >
<div id="advanced-profile-age-text">$lbl_age</div> <div id="advanced-profile-age-text" class="advanced-profile-label">$lbl_age</div>
<div id="advanced-profile-age">$age</div> <div id="advanced-profile-age" class="advanced-profile-content">$age</div>
</div> </div>
<div id="advanced-profile-age-end"></div> <div id="advanced-profile-age-end"></div>
EOT; EOT;
@ -72,8 +72,8 @@ if($a->profile['marital']) {
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-marital-wrapper" > <div id="advanced-profile-marital-wrapper" >
<div id="advanced-profile-marital-text">$lbl_marital</div> <div id="advanced-profile-marital-text" class="advanced-profile-label">$lbl_marital</div>
<div id="advanced-profile-marital">$marital</div> <div id="advanced-profile-marital" class="advanced-profile-content">$marital</div>
EOT; EOT;
if($a->profile['with']) { if($a->profile['with']) {
@ -92,8 +92,8 @@ if($a->profile['sexual']) {
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-sexual-wrapper" > <div id="advanced-profile-sexual-wrapper" >
<div id="advanced-profile-sexual-text">$lbl_sexual</div> <div id="advanced-profile-sexual-text" class="advanced-profile-label">$lbl_sexual</div>
<div id="advanced-profile-sexual">$sexual</div> <div id="advanced-profile-sexual" class="advanced-profile-content">$sexual</div>
</div> </div>
<div id="advanced-profile-sexual-end"></div> <div id="advanced-profile-sexual-end"></div>
EOT; EOT;
@ -104,8 +104,8 @@ if($a->profile['homepage']) {
$homepage = linkify($a->profile['homepage']); $homepage = linkify($a->profile['homepage']);
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-homepage-wrapper" > <div id="advanced-profile-homepage-wrapper" >
<div id="advanced-profile-homepage-text">$lbl_homepage</div> <div id="advanced-profile-homepage-text" class="advanced-profile-label">$lbl_homepage</div>
<div id="advanced-profile-homepage">$homepage</div> <div id="advanced-profile-homepage" class="advanced-profile-content">$homepage</div>
</div> </div>
<div id="advanced-profile-homepage-end"></div> <div id="advanced-profile-homepage-end"></div>
EOT; EOT;
@ -116,8 +116,8 @@ if($a->profile['politic']) {
$politic = $a->profile['politic']; $politic = $a->profile['politic'];
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-politic-wrapper" > <div id="advanced-profile-politic-wrapper" >
<div id="advanced-profile-politic-text">$lbl_politic</div> <div id="advanced-profile-politic-text" class="advanced-profile-label">$lbl_politic</div>
<div id="advanced-profile-politic">$politic</div> <div id="advanced-profile-politic" class="advanced-profile-content">$politic</div>
</div> </div>
<div id="advanced-profile-politic-end"></div> <div id="advanced-profile-politic-end"></div>
EOT; EOT;
@ -128,8 +128,8 @@ if($a->profile['religion']) {
$religion = $a->profile['religion']; $religion = $a->profile['religion'];
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-religion-wrapper" > <div id="advanced-profile-religion-wrapper" >
<div id="advanced-profile-religion-text">$lbl_religion</div> <div id="advanced-profile-religion-text" class="advanced-profile-label">$lbl_religion</div>
<div id="advanced-profile-religion">$religion</div> <div id="advanced-profile-religion" class="advanced-profile-content">$religion</div>
</div> </div>
<div id="advanced-profile-religion-end"></div> <div id="advanced-profile-religion-end"></div>
EOT; EOT;
@ -138,9 +138,9 @@ if($txt = prepare_text($a->profile['about'])) {
$lbl_about = t('About:'); $lbl_about = t('About:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-about-wrapper" > <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 /> <br />
<div id="advanced-profile-about">$txt</div> <div id="advanced-profile-about" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-about-end"></div> <div id="advanced-profile-about-end"></div>
EOT; EOT;
@ -150,9 +150,9 @@ if($txt = prepare_text($a->profile['interest'])) {
$lbl_interests = t('Hobbies/Interests:'); $lbl_interests = t('Hobbies/Interests:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-interest-wrapper" > <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 /> <br />
<div id="advanced-profile-interest">$txt</div> <div id="advanced-profile-interest" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-interest-end"></div> <div id="advanced-profile-interest-end"></div>
EOT; EOT;
@ -162,9 +162,9 @@ if($txt = prepare_text($a->profile['contact'])) {
$lbl_contact = t('Contact information and Social Networks:'); $lbl_contact = t('Contact information and Social Networks:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-contact-wrapper" > <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 /> <br />
<div id="advanced-profile-contact">$txt</div> <div id="advanced-profile-contact" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-contact-end"></div> <div id="advanced-profile-contact-end"></div>
EOT; EOT;
@ -174,9 +174,9 @@ if($txt = prepare_text($a->profile['music'])) {
$lbl_music = t('Musical interests:'); $lbl_music = t('Musical interests:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-music-wrapper" > <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 /> <br />
<div id="advanced-profile-music">$txt</div> <div id="advanced-profile-music" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-music-end"></div> <div id="advanced-profile-music-end"></div>
EOT; EOT;
@ -186,9 +186,9 @@ if($txt = prepare_text($a->profile['book'])) {
$lbl_book = t('Books, literature:'); $lbl_book = t('Books, literature:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-book-wrapper" > <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 /> <br />
<div id="advanced-profile-book">$txt</div> <div id="advanced-profile-book" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-book-end"></div> <div id="advanced-profile-book-end"></div>
EOT; EOT;
@ -198,9 +198,9 @@ if($txt = prepare_text($a->profile['tv'])) {
$lbl_tv = t('Television:'); $lbl_tv = t('Television:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-tv-wrapper" > <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 /> <br />
<div id="advanced-profile-tv">$txt</div> <div id="advanced-profile-tv" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-tv-end"></div> <div id="advanced-profile-tv-end"></div>
EOT; EOT;
@ -210,9 +210,9 @@ if($txt = prepare_text($a->profile['film'])) {
$lbl_film = t('Film/dance/culture/entertainment:'); $lbl_film = t('Film/dance/culture/entertainment:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-film-wrapper" > <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 /> <br />
<div id="advanced-profile-film">$txt</div> <div id="advanced-profile-film" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-film-end"></div> <div id="advanced-profile-film-end"></div>
EOT; EOT;
@ -222,9 +222,9 @@ if($txt = prepare_text($a->profile['romance'])) {
$lbl_romance = t('Love/Romance:'); $lbl_romance = t('Love/Romance:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-romance-wrapper" > <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 /> <br />
<div id="advanced-profile-romance">$txt</div> <div id="advanced-profile-romance" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-romance-end"></div> <div id="advanced-profile-romance-end"></div>
EOT; EOT;
@ -234,9 +234,9 @@ if($txt = prepare_text($a->profile['work'])) {
$lbl_work = t('Work/employment:'); $lbl_work = t('Work/employment:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-work-wrapper" > <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 /> <br />
<div id="advanced-profile-work">$txt</div> <div id="advanced-profile-work" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-work-end"></div> <div id="advanced-profile-work-end"></div>
EOT; EOT;
@ -246,9 +246,9 @@ if($txt = prepare_text($a->profile['education'])) {
$lbl_education = t('School/education:'); $lbl_education = t('School/education:');
$o .= <<< EOT $o .= <<< EOT
<div id="advanced-profile-education-wrapper" > <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 /> <br />
<div id="advanced-profile-education">$txt</div> <div id="advanced-profile-education" class="advanced-profile-content">$txt</div>
</div> </div>
<div id="advanced-profile-education-end"></div> <div id="advanced-profile-education-end"></div>
EOT; EOT;

23
mod/contacts.php
View file

@ -23,8 +23,6 @@ function contacts_init(&$a) {
$a->page['aside'] = ''; $a->page['aside'] = '';
$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
if(get_config('system','invitation_only')) { if(get_config('system','invitation_only')) {
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) { if($x || is_site_admin()) {
@ -33,21 +31,26 @@ function contacts_init(&$a) {
. '</div>' . $inv; . '</div>' . $inv;
} }
} }
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'); $tpl = get_markup_template('follow.tpl');
$findSimilarLink = '<div class="side-link" id="side-match-link"><a href="match" >'
. t('Similar Interests') . '</a></div>';
$inv = '';
if($a->config['register_policy'] != REGISTER_CLOSED) {
$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
}
$a->page['aside'] .= replace_macros($tpl,array( $a->page['aside'] .= replace_macros($tpl,array(
'$label' => t('Connect/Follow'), '$label' => t('Connect/Follow'),
'$hint' => t('Example: bob@example.com, http://example.com/barbara'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
'$follow' => t('Follow') '$follow' => t('Follow'),
'$findSimilar' => $findSimilarLink,
'$inviteFriends' => $inv
)); ));
} }

5
mod/group.php
View file

@ -176,8 +176,8 @@ function group_content(&$a) {
if($change) if($change)
$o = ''; $o = '';
$o .= '<div id="group-members">';
$o .= '<h3>' . t('Members') . '</h3>'; $o .= '<h3>' . t('Members') . '</h3>';
$o .= '<div id="group-members">';
$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
foreach($members as $member) { foreach($members as $member) {
if($member['url']) { if($member['url']) {
@ -190,9 +190,10 @@ function group_content(&$a) {
$o .= '</div><div id="group-members-end"></div>'; $o .= '</div><div id="group-members-end"></div>';
$o .= '<hr id="group-separator" />'; $o .= '<hr id="group-separator" />';
$o .= '<h3>' . t('All Contacts') . '</h3>';
$o .= '<div id="group-all-contacts">'; $o .= '<div id="group-all-contacts">';
$o .= '<h3>' . t('All Contacts') . '</h3>';
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
intval(local_user()) intval(local_user())
); );

136
mod/network.php
View file

@ -17,12 +17,12 @@ function network_init(&$a) {
// We need a better way of managing a growing argument list // We need a better way of managing a growing argument list
$srchurl = '/network' // moved into savedsearches()
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') // $srchurl = '/network'
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') // . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
. ((x($_GET,'order')) ? '?order=' . $_GET['order'] : '') // . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : ''); // . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
if(x($_GET,'save')) { if(x($_GET,'save')) {
$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1", $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
intval(local_user()), intval(local_user()),
@ -42,76 +42,110 @@ function network_init(&$a) {
); );
} }
$a->page['aside'] .= search($search,'netsearch-box',$srchurl,true); // item filter tabs
// TODO: fix this logic, reduce duplication
$a->page['aside'] .= '<div id="network-new-link">'; $a->page['content'] .= '<div class="tabs-wrapper">';
$starred_active = '';
$a->page['aside'] .= '<div id="network-view-link">'; $new_active = '';
if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) { $bookmarked_active = '';
$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>'; $all_active = '';
$search_active = '';
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,'search')) {
$search_active = 'active';
if(x($_GET,'star'))
$a->page['aside'] .= '<div id="network-star-link">'
. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd
. ((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>';
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>';
} }
$a->page['aside'] .= '</div>'; 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('New') . '</a>';
// 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'] .= group_side('network','network',true,$group_id); $a->page['aside'] .= group_side('network','network',true,$group_id);
// 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(); $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 = ''; $o = '';
$r = q("select `term` from `search` WHERE `uid` = %d", $r = q("select `term` from `search` WHERE `uid` = %d",
intval(local_user()) 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)) { if(count($r)) {
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n"; $o .= '<ul id="saved-search-ul">' . "\r\n";
$o .= '<div id="saved-search-list"><ul id="saved-search-ul">' . "\r\n";
foreach($r as $rr) { 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 .= '<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; return $o;
} }
function network_content(&$a, $update = 0) { function network_content(&$a, $update = 0) {
require_once('include/conversation.php'); require_once('include/conversation.php');

11
mod/photos.php
View file

@ -33,11 +33,14 @@ function photos_init(&$a) {
if(count($albums)) { if(count($albums)) {
$a->data['albums'] = $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 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>'; $o .= '<ul>';
foreach($albums as $album) { foreach($albums as $album) {

5
mod/search.php
View file

@ -9,8 +9,9 @@ function search_saved_searches() {
); );
if(count($r)) { if(count($r)) {
$o .= '<div id="saved-search-list" class="widget">';
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n"; $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) { foreach($r as $rr) {
$o .= '<li class="saved-search-li clear"><a href="search/?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="search/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n"; $o .= '<li class="saved-search-li clear"><a href="search/?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="search/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
} }
@ -140,7 +141,7 @@ function search_content(&$a) {
); );
$o .= '<h2>Search results for: ' . $search . '</h2>';
$o .= conversation($a,$r,'search',false); $o .= conversation($a,$r,'search',false);

15
view/follow.tpl
View file

@ -1,10 +1,9 @@
<div class="side-follow-wrapper" id="side-follow-wrapper" > <div id="follow-sidebar" class="widget">
<form action="follow" method="post" /> <h3>Find People</h3>
<label id="side-follow-label" for="side-follow-url" >$label</label> <form action="follow" method="post" />
<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /> <input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
<div class="side-follow-input-end"></div> </form>
<input id="side-follow-submit" type="submit" name="submit" value="$follow" /> $findSimilar
</form> $inviteFriends
</div> </div>
<div class="side-follow-end"></div>

BIN
view/theme/testbubble/calendar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
view/theme/testbubble/connect.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 443 B

67
view/theme/testbubble/contact_edit.tpl Normal file
View file

@ -0,0 +1,67 @@
<h2>$header</h2>
<div id="contact-edit-banner-name">$name</div>
$nettype
<form action="contacts/$contact_id" method="post" >
<input type="hidden" name="contact_id" value="$contact_id">
<div id="contact-edit-wrapper" >
<div id="contact-edit-photo-wrapper" >
<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
<div id="contact-edit-photo" >
<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
</div>
<div id="contact-edit-photo-end" ></div>
</div>
<div id="contact-edit-nav-wrapper" >
<div id="contact-edit-links" >
<a href="contacts/$contact_id/block" class="icon block" id="contact-edit-block-link" title="$block_text"></a>
<a href="contacts/$contact_id/ignore" class="icon no" id="contact-edit-ignore-link" title="$ignore_text"></a>
<a href="crepair/$contact_id" class="icon tools" id="contact-edit-repair" title="$lblcrepair"></a>
<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
</div>
<div id="contact-edit-nav-end"></div>
{{ if $poll_enabled }}
<div id="contact-edit-poll-wrapper">
<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
<div id="contact-edit-poll-text">$updpub</div>
$poll_interval
<div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
</div>
{{ endif }}
</div>
<div id="contact-edit-end" ></div>
$insecure
$blocked
$ignored
<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
$lblsuggest
<div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4>
<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
</div>
<div id="contact-edit-info-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
<div id="contact-edit-profile-select-text">
<h4>$lbl_vis1</h4>
<p>$lbl_vis2
</p>
</div>
$profile_select
<div id="contact-edit-profile-select-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
</form>
</div>

8
view/theme/testbubble/group_drop.tpl Normal file
View file

@ -0,0 +1,8 @@
<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
<a href="group/drop/$id"
onclick="return confirmDelete();"
title="$delete"
id="group-delete-icon-$id"
class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
</div>
<div class="group-delete-end"></div>

19
view/theme/testbubble/group_edit.tpl Normal file
View file

@ -0,0 +1,19 @@
<h2>$title</h2>
<div id="group-edit-wrapper" >
<form action="group/$gid" id="group-edit-form" method="post" >
<div id="group-edit-name-wrapper" >
<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
<input type="text" id="group-edit-name" name="groupname" value="$name" />
<div id="group-edit-submit-wrapper" >
<input type="submit" name="submit" value="$submit" >
</div>
</div>
<div id="group-edit-name-end"></div>
$drop
<div id="group-edit-desc">$desc</div>
<div id="group-edit-select-end" ></div>
</form>
</div>

BIN
view/theme/testbubble/groups.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 911 B

BIN
view/theme/testbubble/icons.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

1442
view/theme/testbubble/icons.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 81 KiB

251
view/theme/testbubble/jot-header.tpl Normal file
View file

@ -0,0 +1,251 @@
<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
var editor=false;
var textlen = 0;
function initEditor(cb) {
if (editor==false) {
$("#profile-jot-text-loading").show();
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste,fullscreen,autoresize",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
//theme_advanced_resizing : true,
//theme_advanced_statusbar_location : "bottom",
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
//Character count
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$("#profile-jot-submit-wrapper").show();
$("#profile-upload-wrapper").show();
$("#profile-attach-wrapper").show();
$("#profile-link-wrapper").show();
$("#profile-youtube-wrapper").show();
$("#profile-video-wrapper").show();
$("#profile-audio-wrapper").show();
$("#profile-location-wrapper").show();
$("#profile-nolocation-wrapper").show();
$("#profile-title-wrapper").show();
$("#profile-jot-plugin-wrapper").show();
$("#character-counter").show();
if (typeof cb!="undefined") cb();
});
}
});
editor = true;
// setup acl popup
$("a#jot-perms-icon").fancybox({
'transitionIn' : 'none',
'transitionOut' : 'none'
});
} else {
if (typeof cb!="undefined") cb();
}
} // initEditor
</script>
<script type="text/javascript" src="include/ajaxupload.js" ></script>
<script>
var ispublic = '$ispublic';
$(document).ready(function() {
/* enable tinymce on focus */
$("#profile-jot-text").focus(function(){
if (editor) return;
$(this).val("");
initEditor();
});
var uploader = new window.AjaxUpload(
'wall-image-upload',
{ action: 'wall_upload/$nickname',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
tinyMCE.execCommand('mceInsertRawHTML',false,response);
$('#profile-rotator').hide();
}
}
);
var file_uploader = new window.AjaxUpload(
'wall-file-upload',
{ action: 'wall_attach/$nickname',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
tinyMCE.execCommand('mceInsertRawHTML',false,response);
$('#profile-rotator').hide();
}
}
);
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
$('#jot-perms-icon').removeClass('unlock').addClass('lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
});
if(selstr == null) {
$('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
}
}).trigger('change');
});
function deleteCheckedItems() {
var checkedstr = '';
$('.item-select').each( function() {
if($(this).is(':checked')) {
if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val();
}
else {
checkedstr = $(this).val();
}
}
});
$.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload();
});
}
function jotGetLink() {
reply = prompt("$linkurl");
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});
}
}
function jotGetVideo() {
reply = prompt("$utubeurl");
if(reply && reply.length) {
tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
}
}
function jotVideoURL() {
reply = prompt("$vidurl");
if(reply && reply.length) {
tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
}
}
function jotAudioURL() {
reply = prompt("$audurl");
if(reply && reply.length) {
tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
}
}
function jotGetLocation() {
reply = prompt("$whereareu", $('#jot-location').val());
if(reply && reply.length) {
$('#jot-location').val(reply);
}
}
function jotTitle() {
reply = prompt("$title", $('#jot-title').val());
if(reply && reply.length) {
$('#jot-title').val(reply);
}
}
function jotShare(id) {
$('#like-rotator-' + id).show();
$.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#like-rotator-' + id).hide();
$(window).scrollTop(0);
});
});
}
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
event.preventDefault();
}
function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list");
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
$('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});
});
}
}
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
}
$geotag
</script>

75
view/theme/testbubble/jot.tpl Normal file
View file

@ -0,0 +1,75 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey" style="display: none;">0</div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;" />
</div>
</div>
<form id="profile-jot-form" action="$action" method="post" >
<input type="hidden" name="type" value="wall" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="title" id="jot-title" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
{{ if $content }}<script>initEditor();</script>{{ endif }}
<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
</div>
<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
</div>
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
<div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
</div>
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
</div>
<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-audio" class="icon border audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
</div>
<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-location" class="icon border globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
</div>
<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-nolocation" class="icon border noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
</div>
<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-title" class="icon border article" title="$title" onclick="jotTitle(); return false;"></a>
</div>
<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
</div>
<div id="profile-jot-plugin-wrapper" style="display: none;">
$jotplugins
</div>
<div id="profile-jot-tools-end"></div>
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
</div>
</div>
<div id="profile-jot-end"></div>
</form>
</div>

BIN
view/theme/testbubble/login-bg.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 237 B

25
view/theme/testbubble/login.tpl Normal file
View file

@ -0,0 +1,25 @@
<form action="" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login-name-wrapper">
<label for="login-name" id="label-login-name">$namelabel</label>
<input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
</div>
<div id="login-name-end" ></div>
<div id="login-password-wrapper">
<label for="login-password" id="label-login-password">$passlabel</label>
<input type="password" maxlength="60" name="password" id="login-password" value="" />
</div>
<div id="login-password-end"></div>
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" value="$login" />
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
<div id="login-submit-end"></div>
<div id="login-extra-links">
<div id="login-extra-filler">&nbsp;</div>
$register_html
</div>
<div id="login-extra-end"></div>
</form>

BIN
view/theme/testbubble/lrarrow.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 236 B

7
view/theme/testbubble/mail_head.tpl Normal file
View file

@ -0,0 +1,7 @@
<h3>$messages</h3>
<ul class="tabs-wrapper">
<li><a href="message" class="tabs">$inbox</a></li>
<li><a href="message/sent" class="tabs">$outbox</a></li>
<li><a href="message/new" class="tabs">$new</a></li>
</ul>

BIN
view/theme/testbubble/menu-user-pin.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 385 B

BIN
view/theme/testbubble/menu-user-pin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

54
view/theme/testbubble/nav.tpl Normal file
View file

@ -0,0 +1,54 @@
$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>
<ul id="user-menu-popup"
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
{{ if $nav.community }}
<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
{{ endif }}
<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
{{ 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>
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}

BIN
view/theme/testbubble/next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 891 B

BIN
view/theme/testbubble/notifications.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
view/theme/testbubble/photo-menu.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

40
view/theme/testbubble/photo_view.tpl Normal file
View file

@ -0,0 +1,40 @@
<div id="live-display"></div>
<h3><a href="$album.0">$album.1</a></h3>
<div id="photo-edit-link-wrap">
{{ if $tools }}
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
{{ endif }}
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
</div>
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>
<div id="photo-photo-end"></div>
<div id="photo-caption" >$desc</div>
{{ if $tags }}
<div id="in-this-photo-text">$tags.0</div>
<div id="in-this-photo">$tags.1</div>
{{ endif }}
{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
{{ if $edit }}$edit{{ endif }}
{{ if $likebuttons }}
<div id="photo-like-div">
$likebuttons
$like
$dislike
</div>
{{ endif }}
$comments
$paginate

BIN
view/theme/testbubble/photography.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 766 B

BIN
view/theme/testbubble/premium.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
view/theme/testbubble/prev.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 853 B

11
view/theme/testbubble/profile_entry.tpl Normal file
View file

@ -0,0 +1,11 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
</div>
<div class="profile-listing-photo-end"></div>
<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
<div class='profile-visible'>$visible</div>
</div>
<div class="profile-listing-end"></div>

9
view/theme/testbubble/profile_tabs.tpl Normal file
View file

@ -0,0 +1,9 @@
<div class="tabs-wrapper" >
<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 {{if $activetab==profile}}active{{endif}}" >$profile</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>

BIN
view/theme/testbubble/search.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 808 B

39
view/theme/testbubble/search_item.tpl Normal file
View file

@ -0,0 +1,39 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
<div class="wall-item-lock-wrapper">$lock</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
$drop
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
</div>
<div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
<div class="wall-item-wrapper-end"></div>
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>

BIN
view/theme/testbubble/star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

3277
view/theme/testbubble/style.css Normal file
View file

File diff suppressed because it is too large Load diff

BIN
view/theme/testbubble/user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 664 B

51
view/theme/testbubble/wall_item.tpl Normal file
View file

@ -0,0 +1,51 @@
<!-- test -->
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
</a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
<div class="wall-item-lock-wrapper">$lock</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
$vote
$plink
$edpost
$star
$drop
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-like" id="wall-item-like-$id">$like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
<div class="wall-item-comment-wrapper" >
$comment
</div>
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>

51
view/theme/testbubble/wallwall_item.tpl Normal file
View file

@ -0,0 +1,51 @@
<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info wallwall" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
</div>
<div class="wall-item-lock-wrapper">$lock</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
$vote
$plink
$edpost
$drop
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-like" id="wall-item-like-$id">$like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
<div class="wall-item-comment-wrapper" >
$comment
</div>
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>