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 2011-09-25 13:20:19 -05:00
parent 634e52a671
commit cb1c6dd1e3
10 changed files with 176 additions and 128 deletions

View file

@ -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;