diff --git a/images/friendika32.gif b/images/friendika32.gif index 78e65ed71e..15dc632f28 100644 Binary files a/images/friendika32.gif and b/images/friendika32.gif differ diff --git a/include/nav.php b/include/nav.php index 78db9e399f..b102064fb5 100644 --- a/include/nav.php +++ b/include/nav.php @@ -55,7 +55,7 @@ else { $banner = get_config('system','banner'); - if($banner === false) - $banner = 'Friendika'; + if($banner === false) + $banner = '@ Friendika'; $a->page['nav'] .= ''; diff --git a/mod/photos.php b/mod/photos.php index fcff73a97b..9f92c11370 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -785,6 +785,13 @@ function photos_content(&$a) { 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 .= '
' . $ph[0]['desc'] . '
'; @@ -837,21 +844,21 @@ function photos_content(&$a) { $o .= '
'; $o .= $likebuttons; $o .= '
'; - } - 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' => '' - )); + 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' => '' + )); + } } } @@ -876,6 +883,24 @@ function photos_content(&$a) { $o .= ''; + + 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) { $comment = ''; $template = $tpl; diff --git a/view/theme/default/style.css b/view/theme/default/style.css index f89b4877b5..7ccccd9118 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -121,16 +121,16 @@ blockquote:before { height: 20px; } #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; position: absolute; - /*filter:alpha(opacity=50);*/ - /*-moz-opacity:0.5;*/ - /*-khtml-opacity: 0.5;*/ - /*opacity: 0.5;*/ - top: 12px; - left: 38%; + top: 10px; + left: 40%; } #panel {