diff options
author | Friendika <info@friendika.com> | 2010-11-04 00:19:10 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2010-11-04 00:19:10 -0700 |
commit | 4f8445760c7a9cc89eed4f7cbb3eccb605ecabbe (patch) | |
tree | 70c31d62c2dad3742c8ea761bd4f6708f7b0d68d | |
parent | b3856a797bcd3e54197f9014eaeef8bc813fc281 (diff) | |
download | volse-hubzilla-4f8445760c7a9cc89eed4f7cbb3eccb605ecabbe.tar.gz volse-hubzilla-4f8445760c7a9cc89eed4f7cbb3eccb605ecabbe.tar.bz2 volse-hubzilla-4f8445760c7a9cc89eed4f7cbb3eccb605ecabbe.zip |
cleanup photo page a bit more, some work on branding
-rw-r--r-- | images/friendika32.gif | bin | 1609 -> 1440 bytes | |||
-rw-r--r-- | include/nav.php | 4 | ||||
-rw-r--r-- | mod/photos.php | 53 | ||||
-rw-r--r-- | view/theme/default/style.css | 16 |
4 files changed, 49 insertions, 24 deletions
diff --git a/images/friendika32.gif b/images/friendika32.gif Binary files differindex 78e65ed71..15dc632f2 100644 --- a/images/friendika32.gif +++ b/images/friendika32.gif diff --git a/include/nav.php b/include/nav.php index 78db9e399..b102064fb 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 = '<span style="color:red;">@</span> Friendika'; $a->page['nav'] .= '<span id="banner">' . $banner . '</span>'; diff --git a/mod/photos.php b/mod/photos.php index fcff73a97..9f92c1137 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 .= '<div id="photo-caption" >' . $ph[0]['desc'] . '</div>'; @@ -837,21 +844,21 @@ function photos_content(&$a) { $o .= '<div id="photo-like-div">'; $o .= $likebuttons; $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' => '' - )); + 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 .= '</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) { $comment = ''; $template = $tpl; diff --git a/view/theme/default/style.css b/view/theme/default/style.css index f89b4877b..7ccccd911 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 { |