harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup photo page a bit more, some work on branding

Browse Source
This commit is contained in:
Friendika
2010-11-04 00:19:10 -07:00
parent b3856a797b
commit 4f8445760c
4 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/friendika32.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
include/nav.php
View File

@@ -56,6 +56,6 @@ else {
$banner = get_config('system','banner'); $banner = get_config('system','banner');
if($banner === false) if($banner === false)
$banner = 'Friendika'; $banner = '<span style="color:red;">@</span> Friendika';
$a->page['nav'] .= '<span id="banner">' . $banner . '</span>'; $a->page['nav'] .= '<span id="banner">' . $banner . '</span>';

53
mod/photos.php
View File

@@ -785,6 +785,13 @@ function photos_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
if((local_user()) && (local_user() == $i1[0]['uid'])) {
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
intval($i1[0]['parent']),
intval(local_user())
);
}
} }
$o .= '<div id="photo-caption" >' . $ph[0]['desc'] . '</div>'; $o .= '<div id="photo-caption" >' . $ph[0]['desc'] . '</div>';
@@ -837,21 +844,21 @@ function photos_content(&$a) {
$o .= '<div id="photo-like-div">'; $o .= '<div id="photo-like-div">';
$o .= $likebuttons; $o .= $likebuttons;
$o .= '</div>'; $o .= '</div>';
}
if(can_write_wall($a,$a->data['user']['uid'])) { if(can_write_wall($a,$a->data['user']['uid'])) {
if($i1[0]['last-child']) { if($i1[0]['last-child']) {
$o .= replace_macros($cmnt_tpl,array( $o .= replace_macros($cmnt_tpl,array(
'$return_path' => $return_url, '$return_path' => $return_url,
'$type' => 'wall-comment', '$type' => 'wall-comment',
'$id' => $i1[0]['id'], '$id' => $i1[0]['id'],
'$parent' => $i1[0]['id'], '$parent' => $i1[0]['id'],
'$profile_uid' => $a->data['user']['uid'], '$profile_uid' => $a->data['user']['uid'],
'$mylink' => $contact['url'], '$mylink' => $contact['url'],
'$mytitle' => t('This is you'), '$mytitle' => t('This is you'),
'$myphoto' => $contact['thumb'], '$myphoto' => $contact['thumb'],
'$ww' => '' '$ww' => ''
)); ));
}
} }
} }
@@ -876,6 +883,24 @@ function photos_content(&$a) {
$o .= '</div>'; $o .= '</div>';
if(can_write_wall($a,$a->data['user']['uid'])) {
if($i1[0]['last-child']) {
$o .= replace_macros($cmnt_tpl,array(
'$return_path' => $return_url,
'$type' => 'wall-comment',
'$id' => $i1[0]['id'],
'$parent' => $i1[0]['id'],
'$profile_uid' => $a->data['user']['uid'],
'$mylink' => $contact['url'],
'$mytitle' => t('This is you'),
'$myphoto' => $contact['thumb'],
'$ww' => ''
));
}
}
foreach($r as $item) { foreach($r as $item) {
$comment = ''; $comment = '';
$template = $tpl; $template = $tpl;

16
view/theme/default/style.css
View File

@@ -121,16 +121,16 @@ blockquote:before {
height: 20px; height: 20px;
} }
#banner { #banner {
color: #F8FF15;
font-size: 1.4em; color: #F5F6FB;
font-family: "lucida sans", verdana, sans;
font-size: 1.8em;
letter-spacing: 0.08em;
font-weight: bold; font-weight: bold;
position: absolute; position: absolute;
/*filter:alpha(opacity=50);*/ top: 10px;
/*-moz-opacity:0.5;*/ left: 40%;
/*-khtml-opacity: 0.5;*/
/*opacity: 0.5;*/
top: 12px;
left: 38%;
} }
#panel { #panel {