From 4f8445760c7a9cc89eed4f7cbb3eccb605ecabbe Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 4 Nov 2010 00:19:10 -0700
Subject: [PATCH] cleanup photo page a bit more, some work on branding

---
 images/friendika32.gif       | Bin 1609 -> 1440 bytes
 include/nav.php              |   4 +--
 mod/photos.php               |  53 ++++++++++++++++++++++++++---------
 view/theme/default/style.css |  16 +++++------
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/images/friendika32.gif b/images/friendika32.gif
index 78e65ed71ee357175581b9cb08409d593ff2a783..15dc632f2897f7103d9cddea45af2275ef9b468c 100644
GIT binary patch
literal 1440
zcmb``i$Bu|008jce*4X45A9`MlM(aSyrwki)*jfXRpgZrH7VS2LR5EoOnFR5ZIlod
zLc_(;ahaUt_~4UI4fXL>7s{)w`*i2-{)hYi4_~3D2iql_2GD@F^8g5Z0f9du*g71x
zi2;_WzyumGPl9GqTI+Q9a|~Jy>MZPq{i=gm$8Q_tL#;%@Ae{ULud_}eH3xuqD5S~V
z1i8M!1Bg08(Onkm)LK)<Wl)rpezUgetJ`1*L?3Dc1!nZB-$1q*?W2`d{!5U4gBWOG
zzQ%A!oP|?0F!)Oh_AyECDS<e!ZJV5GUusN!k3uO8jqI3fNlb<b=i(qmyTsgRia=u7
zFU^v`TpMeIhjJ%tW84tV;l#9=G9p~qh4v0?=XIXo7>^&D#NJ)QU~)K}A$;zdq0z7<
z)M<+<brP2Da`rgL|3KR=<v5GnYqf&Pks;T*c7bY!?GoKGStu5HtRD9MwsIdg&g;8J
z0(d}x?+|;pB*4!pisdG8^NujCIS5zr1&E~c0f8+c5?6oUk71$bmR<K+q&SC3jx)|P
zg5wCm$Cl*bn8?V8rbCw|JUz9f31P=qOF}~<PZtIz2B2hNY$^NDMKSVv47SA2PwIE}
zY;|nx%DMCBVzUv^>Cr}2hFUd#!E)S>=|7|-uhMJG!*4-ZSFWr?N2jH&W#xxlmW~K&
z1tO)kRwp0%#N~8Zq-7f&+hx;sIn%8jA(O2NlnMFrd~%;YV!%;REXNG#59Z`lE99?p
zvMq*?jspmV;%#E}!}79f+ypMDGstAjBwLwvrsE9x4bxg}t*R(PEKqA|tMA_ZXs`ew
z-Wxots;sSR#w?<3X7rFBNTQdb2elgwP4&<Q4!4e2t*D?b8=*g;k()^RA|2A8xzl`Y
zjW+ldY-(B~Ysh9BW;4o$3okA_{-xdfozK+~S^e`&`%QcHC-(bCKdGKR@zQvSH^s`4
zhdvsg#HGaE;ohiEQ3;<DUX1=xzErMOzbg4uJUctnqG{dwznOl4U;wZMFoA#lcLG5D
z4Qy#sMU54z3>400@!kQNOYHc=@I|_vX}8ea5JKVa^fOLA=jTXT2WPkuJMl5t#;$zZ
zLI;6a#wnjd=?$0z6)YJju0M2xKhLK(7rW;f;es{mj5(#?8*W&m>Me1kpaWm2&I;ob
zIHq~?Q9Jk%06fK~ok)pS+hnBshg$id{8^IwQ!8<msu*JM>(Y>j`MRk=0G(r=b3eCG
zVazbQmE73GuZY{KAXuErrZwb&UIQs~vCdpy&A!yK6U!!T5vCTpl;p@NkXC!soo9UX
zvP{<o9Wz?sIrXSOu?M%&G@_CR#w7nd^}Snv5l!2f(-yyIvTH6|>u=&1DqL(l>W}9c
zK>Z4(udXwz0Jbo>Dp6?RM!_&{rrnc<l?;0OJI9HAlT;5Cn#JutAj*|m78rWo#*gX9
zdXlChVfYoEBp!ehP4ch_{T@&p{wV35w8x7viy}YsKuYl?dM)Nfzw1}vud6%|vPMuR
zw-4IyycH9#h8)~_rPe+AEFsS+O0OHA+LiRmvF59ODqt-ljHN!v@;<@aQ=h;^o{nqI
z6}3`NJTthEoZgpN)G^)5tERPh!?&wdM*@3k8CcVk*H$y*k?zfD02{$YScp}=`wa>^
zE1)XW2u}qoh@V#(6k|_Xv5LOp$FSkW8~NBvbZJ)_LNDuZI^p;`n8@VJ>(p@qF^C)@
zv6bAJ<PJ&V5m9y*3v=qW!qRSH6H&fmhpWsqLku5^CR%qmwz-jEpZx`O!)WvV=IOQ1
zeB6=yuEVyc=7#Msj#ksX%r(kR^!8v{S`SGmbrk0RWd?ce$V=#s?Zyk4O<WiZaQz1&
C>40MZ

literal 1609
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
Hc|ZU=LZ9VM

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 = '<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 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 .= '<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 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 {