Merge remote branch 'upstream/master'

1 files changed, 43 insertions, 2 deletions

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index e5aa710c7..f9128ea1f 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -11,6 +11,42 @@ $a->theme_info = array(
   'extends' => 'diabook',
 );
 
+//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
+
+//profile_side
+
+$nav['usermenu']=array();
+$userinfo = null;
+
+if(local_user()) {
+	
+
+
+$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		
+$userinfo = array(
+			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+			'name' => $a->user['username'],
+		);	
+	
+$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
+$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
+
+if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
+$tpl = get_markup_template('profile_side.tpl');
+
+$a->page['aside'] .= replace_macros($tpl, array(
+		'$userinfo' => $userinfo,
+		'$ps' => $ps,
+	));
+}
+}
+
+//js scripts
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
@@ -74,10 +110,15 @@ $('html').click(function() {
      event.stopPropagation();
  });
  
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
+
+
+ $(document).ready(function() {
+	$("a.fancy-photo").fancybox(); // Select all links with lightbox class 
+	$("a.fancy-album").fancybox();
 });
 
+
+
  
  </script>
 EOT;