Merge commit 'upstream/master'

12 files changed, 253 insertions, 34 deletions

diff --git a/view/theme/diabook-blue/experimental b/view/theme/diabook-blue/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/diabook-blue/experimental
+++ /dev/null
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
new file mode 100755
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook-blue/group_side.tpl
@@ -0,0 +1,29 @@
+<div id="group-sidebar" class="widget">
+	<div class="title tool">
+		<h3 class="label">$title</h3>
+		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul>
+			{{ for $groups as $group }}
+			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
+				<a href="$group.href" class="label">
+					$group.text
+				</a>
+				{{ if $group.edit }}
+					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
+				{{ endif }}
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}
+			</li>
+			{{ endfor }}
+		</ul>
+	</div>
+</div>	
+
diff --git a/view/theme/diabook-blue/icons/isstar.png b/view/theme/diabook-blue/icons/isstar.png
deleted file mode 100644
index c955b25b5..000000000
--- a/view/theme/diabook-blue/icons/isstar.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-blue/icons/next.png
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png
new file mode 100755
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook-blue/icons/prev.png
diff --git a/view/theme/diabook-blue/icons/toogle_off.png b/view/theme/diabook-blue/icons/toogle_off.png
index 99490bcd9..0fcce4d5a 100755..100644
--- a/view/theme/diabook-blue/icons/toogle_off.png
+++ b/view/theme/diabook-blue/icons/toogle_off.png
diff --git a/view/theme/diabook-blue/icons/toogle_on.png b/view/theme/diabook-blue/icons/toogle_on.png
index 81e8f9120..79ce07f0e 100755..100644
--- a/view/theme/diabook-blue/icons/toogle_on.png
+++ b/view/theme/diabook-blue/icons/toogle_on.png
diff --git a/view/theme/diabook-blue/icons/unglobe.png b/view/theme/diabook-blue/icons/unglobe.png
deleted file mode 100755
index aa9b0e189..000000000
--- a/view/theme/diabook-blue/icons/unglobe.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
new file mode 100755
index 000000000..511fc73ac
--- /dev/null
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -0,0 +1,27 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+-
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
+</div>
+
+<div id="photo-photo">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
\ No newline at end of file
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
new file mode 100644
index 000000000..01da55ce1
--- /dev/null
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -0,0 +1,20 @@
+<div id="profile_side">
+	<div id="ps-usernameicon">
+		<a href="$ps.usermenu.status.0" title="$userinfo.name">
+			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
+		</a>
+		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+	<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+	<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+	<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+</ul>
+
+</div>
+
+				
\ No newline at end of file
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 51b173f2a..bdc79a350 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -247,7 +247,7 @@
   background-image: url("../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/icons/10/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s10.menu {
   background-image: url("../../../images/icons/10/menu.png");
@@ -285,7 +285,7 @@
   background-image: url("../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/icons/16/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s16.menu {
   background-image: url("../../../images/icons/16/menu.png");
@@ -323,7 +323,7 @@
   background-image: url("../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/icons/22/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s22.menu {
   background-image: url("../../../images/icons/22/menu.png");
@@ -361,7 +361,7 @@
   background-image: url("../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/icons/48/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s48.menu {
   background-image: url("../../../images/icons/48/menu.png");
@@ -438,7 +438,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #3465A4;
+  color: #1872A2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -461,7 +461,7 @@ code {
 }
 #panel {
   position: absolute;
-  width: 10em;
+  width: 12em;
   background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
@@ -647,7 +647,7 @@ nav .nav-menu-icon {
   position: relative;
   height: 22px;
   padding: 5px;
-  margin: 0px 7px;
+  margin: 0px 5px;
   -moz-border-radius: 5px 5px 0 0;
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
@@ -657,7 +657,7 @@ nav .nav-menu-icon:hover {
   position: relative;
   height: 22px;
   padding: 5px;
-  margin: 0px 7px;
+  margin: 0px 5px;
   -moz-border-radius: 5px 5px 0 0;
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
@@ -716,21 +716,17 @@ nav #nav-user-linkmenu
 nav #nav-user-linkmenu{
 	margin-right: 0px;
 	}
-nav #nav-home-link{
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
 	margin-left: 0px;
+	margin-right: 0px;
 	font-weight: bold;
+	margin: 3px 5px;
 	}
 nav #nav-directory-link{
-	margin-left: 0px;
-	margin-right: 0px;
-	font-weight: bold;
-	margin: 3px 15px;
+  margin-right: 0px;	
 	}
-nav #nav-apps-link{
-	margin-left: 0px;
-	margin-right: 0px;
-	font-weight: bold;
-	margin: 3px 15px;
+nav #nav-home-link{
+  margin-left: 0px;	
 	}
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,
@@ -784,8 +780,6 @@ ul.menu-popup {
   margin: 0px;
   padding: 0px;
   list-style: none;
-  border: 1px solid #364e59;
-  border-top-color: transparent;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
@@ -878,6 +872,41 @@ ul.menu-popup .empty {
         padding: 7px 7px 0px 0px;
 }
 
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+	list-style: none;	
+  padding-left: 16px;
+  min-height: 16px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+	}
+.menu-profile-list:hover{
+	background: #EEE;
+	}
+.menu-profile-list-item:hover{	
+	text-decoration: none;	
+   }
 /* aside */
 aside {
   display: table-cell;
@@ -974,6 +1003,10 @@ aside #side-peoplefind-url {
   widht: 55px;
   height: 55px;
 }
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1048,6 +1081,12 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+body .pageheader{
+  text-align: center;
+  margin-top: 25px;
+  font-size: 0px;
+	}
+
 #id_username {
   width: 173px;	
 	}
@@ -1063,7 +1102,8 @@ section {
    padding: 10px;
 	text-align: center;
 	font-size: 1.0em;
-	margin-top: 140%;
+	clear: both;
+	display: block;
 }	
 
 .tabs {
@@ -1306,14 +1346,14 @@ section {
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1616,7 +1656,7 @@ section {
     box-shadow: 0 1px 1px #CFCFCF;
 }
 .button.creation2 {
-    background-color: #33ACFF;
+    background-color: #1872A2;
     background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
     border: 1px solid #777777;
     color: white;
@@ -1872,9 +1912,15 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
 .lframe {
   float: left;
-  margin: 0px 10px 10px 0px;
+  /*margin: 0px 10px 10px 0px;*/
 }
 /* profile match wrapper */
 .profile-match-wrapper {
@@ -1988,10 +2034,24 @@ box-shadow: 1px 1px 5px 0;
 }
 
 #prvmail-submit {
-	float: left;
+	float: right;
 	margin-top: 10px;
-	margin-right: 30px;
 }
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
 #prvmail-upload-wrapper,
 #prvmail-link-wrapper,
 #prvmail-rotator-wrapper {
@@ -2179,7 +2239,9 @@ a.mail-list-link {
         padding: 10px;
         float: left;
 }
-
+.lightbox{
+	float: left;
+	}
 #photo-photo {
         float: left;
 }
@@ -2298,8 +2360,36 @@ float: left;
 .contact-details {
   color: #999999;
 }
-
-.photo-top-image-wrapper {
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #EEE;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+}
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+/*.photo-top-image-wrapper {
         position: relative;
         float: left;
         margin-top: 15px;
@@ -2315,7 +2405,7 @@ float: left;
         padding: 0px 3px;
         padding-top: 0.5em;
         background-color: rgb(255, 255, 255);
-}
+}*/
 #photo-top-end {
         clear: both;
 }
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 0a20c9fbc..9093ac2ca 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -1,8 +1,8 @@
 <?php
 
 /*
- * Name: Diabook
- * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Name: Diabook-blue
+ * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
  * Version: 
  * Author: 
  */
@@ -11,8 +11,46 @@ $a->theme_info = array(
   'extends' => 'diabook',
 );
 
+//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>
+
 //contacts
 $('html').click(function() {
  $('#nav-contacts-linkmenu').removeClass('selected');
@@ -62,5 +100,20 @@ $('html').click(function() {
  $('#nav-site-linkmenu').click(function(event){
      event.stopPropagation();
  });
-</script>
+ //appsmenu
+ $('html').click(function() {
+ $('#nav-apps-link').removeClass('selected');
+ document.getElementById( "nav-apps-menu" ).style.display = "none";
+ });
+
+ $('#nav-apps-link').click(function(event){
+     event.stopPropagation();
+ });
+ 
+ $(function() {
+	$('a.lightbox').fancybox(); // Select all links with lightbox class
+});
+
+ 
+ </script>
 EOT;