cleanup photo page a bit more, some work on branding

diff --git a/images/friendika32.gif b/images/friendika32.gif
index 78e65ed71ee357175581b9cb08409d593ff2a783..15dc632f2897f7103d9cddea45af2275ef9b468c 100644 (file)
Binary files a/images/friendika32.gif and b/images/friendika32.gif differ

diff --git a/include/nav.php b/include/nav.php
index 78db9e399fd24ca0df8350a84e88481dbf67deb7..b102064fb5a45ab9e6b5500887d7a18a5718e765 100644 (file)
--- 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 fcff73a97b113030fbdd944425c18a485d7a3616..9f92c11370f54d09bba71e98628bc083b7bab2a1 100644 (file)
--- 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 f89b4877b5192f3b3d21b48d62e11f84ead4140f..7ccccd91182d9bab02467ef4025a2f585f9e7059 100644 (file)
--- 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 {