Merge branch 'pull'

view/theme/diabook-aerith/communityhome.tpl

@@ -0,0 +1,92 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+{{ endif }}
+</div>
+
+<div id="close_lastusers">
+{{ if $lastusers_title }}
+<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{ for $lastusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+
+{{ if $activeusers_title }}
+<h3>$activeusers_title</h3>
+<div class='items-wrapper'>
+{{ for $activeusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+
+<div id="close_lastphotos">
+{{ if $photos_title }}
+<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{ for $photos_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+<div id="close_lastlikes">
+{{ if $like_title }}
+<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
+<ul id='likes'>
+{{ for $like_items as $i }}
+	<li id='ra-photos-wrapper'>$i</li>
+{{ endfor }}
+</ul>
+{{ endif }}
+</div>

view/theme/diabook-aerith/contact_template.tpl

@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/diabook-aerith/directory_item.tpl

@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>

view/theme/diabook-aerith/fpostit/README

@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet

view/theme/diabook-aerith/fpostit/fpostit.js

@@ -0,0 +1,6 @@
+javascript: (function() {
+    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    						a_funct = function() {
+        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
+    							else {a_funct()}})()"

view/theme/diabook-aerith/fpostit/fpostit.php

@@ -0,0 +1,135 @@
+<?php
+if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
+	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+	<style>
+		body {
+			font-family: arial, Helvetica,sans-serif;
+			margin: 0px;
+		}
+		.wrap1 {
+			padding: 2px 5px;
+			background-color: #000;
+			margin-bottom: 10px;
+		}
+		.wrap2 {
+			margin-left: 10px;
+			font-size: 12px;
+		}
+		.logo {
+			margin-left: 3px;
+			margin-right: 5px;
+			float: left;
+		}
+		h2 {
+			color: #ffffff;
+		}
+		.error {
+			background-color: #FFFF66;
+			font-size: 12px;
+			margin-left: 10px;
+		}
+	</style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+	$title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+	$text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+	$url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+	$content = "$title\nsource:$url\n\n$text";
+} else {
+	$content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+	
+	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+		$acctname = $_POST["friendika_acct_name"];
+		$tmp_account_array = explode("@", $acctname);
+		if (isset($tmp_account_array[1])) {
+			$username = $tmp_account_array[0];
+			$hostname = $tmp_account_array[1];
+		}
+		$password = $_POST["friendika_password"];
+		$content = $_POST["content"];
+
+		$url = "http://" . $hostname . '/api/statuses/update';
+		$data = array('status' => $content);
+		
+		// echo "posting to: $url<br/>";
+
+		$c = curl_init();
+		curl_setopt($c, CURLOPT_URL, $url); 
+		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
+		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+		$c_result = curl_exec($c); 
+		if(curl_errno($c)){ 
+			$error = curl_error($c);
+			showForm($error, $content);
+		}
+		
+		curl_close($c);
+		if (!isset($error)) {
+			echo '<script language="javascript" type="text/javascript">window.close();</script>';
+		}
+		
+	} else {
+		$error = "Missing account name and/or password...try again please";
+		showForm($error, $content);
+	}
+	
+} else {
+	showForm(null, $content);
+}
+
+function showForm($error, $content) {
+	$username_cookie = $_COOKIE['username'];
+	$password_cookie = $_COOKIE['password'];
+	
+	echo <<<EOF
+	<div class='wrap1'>
+		<h2><img class='logo' src='friendika-32.png' align='middle';/>
+		Friendika Bookmarklet</h2>
+	</div>
+
+	<div class="wrap2">
+		<form method="post" action="{$_SERVER['PHP_SELF']}">
+			Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
+			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
+		</form>
+		<p></p>
+	</div>
+EOF;
+	
+}
+?>
+
+</body>
+</html>

view/theme/diabook-aerith/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>	
+

view/theme/diabook-aerith/jot.tpl

@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}

view/theme/diabook-aerith/js/jquery.cookie.js

@@ -0,0 +1,47 @@
+/*!
+ * jQuery Cookie Plugin
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2011, Klaus Hartl
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/GPL-2.0
+ */
+(function($) {
+    $.cookie = function(key, value, options) {
+
+        // key and at least value given, set cookie...
+        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
+            options = $.extend({}, options);
+
+            if (value === null || value === undefined) {
+                options.expires = -1;
+            }
+
+            if (typeof options.expires === 'number') {
+                var days = options.expires, t = options.expires = new Date();
+                t.setDate(t.getDate() + days);
+            }
+
+            value = String(value);
+
+            return (document.cookie = [
+                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
+                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+                options.path    ? '; path=' + options.path : '',
+                options.domain  ? '; domain=' + options.domain : '',
+                options.secure  ? '; secure' : ''
+            ].join(''));
+        }
+
+        // key and possibly options given, get cookie...
+        options = value || {};
+        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
+
+        var pairs = document.cookie.split('; ');
+        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
+            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
+        }
+        return null;
+    };
+})(jQuery);

view/theme/diabook-aerith/nav.tpl

@@ -0,0 +1,186 @@
+<header>
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+			
+			
+	<ul>
+			
+			
+			{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu-icon">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
+				<span class="icon notifications">Benachrichtigungen</span></a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		    {{ endif }}
+	
+			{{ if $nav.contacts }}
+			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
+				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
+				<span class="icon contacts">$nav.contacts.1</span></a>
+				<span id="intro-update" class="nav-notify"></span>
+				<ul id="nav-contacts-menu" class="menu-popup">
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span></a>
+				<span id="mail-update" class="nav-notify"></span>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
+				</ul>
+			</li>		
+			{{ endif }}
+		
+      {{ if $nav.notifications }}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</li>		
+		{{ endif }}	
+			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+
+				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
+
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+										
+										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+
+				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+
+				
+			</ul>		
+		</li>
+		
+		{{ if $nav.directory }}
+		<li id="nav-directory-link" class="nav-menu $sel.directory">
+			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+		</li>
+		{{ endif }}
+		
+		
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li>$ap</li>
+					{{ endfor }}
+				</ul>
+			</li>	
+		{{ endif }}		
+		
+      {{ if $nav.settings }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}		
+		
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+				</ul>
+			</li>
+		{{ endif }}
+		
+					{{ if $nav.login }}
+					<li id="nav-home-link" class="nav-menu $sel.home">
+						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+					<li>
+					{{ endif }}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+	
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+	
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}

view/theme/diabook-aerith/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 }}

view/theme/diabook-aerith/profile_side.tpl

@@ -0,0 +1,21 @@
+<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 home"><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 photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+		<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>	
+	<li id="profile-side-events" class="menu-profile-list events"><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 notes"><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 foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+</ul>
+
+</div>
+
+				

view/theme/diabook-aerith/profile_vcard.tpl

@@ -0,0 +1,64 @@
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				<li><a href="profiles" >$profile.edit.3</a></li>
+								
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt><br> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+

view/theme/diabook-aerith/right_aside.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 home"><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 photos"><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 events"><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 notes"><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 foren"><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 com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+</ul>
+
+</div>
+
+				

view/theme/diabook-aerith/theme.php

@@ -0,0 +1,379 @@
+<?php
+
+/*
+ * Name: Diabook-aerith
+ * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version: 
+ * Author: 
+ */
+
+
+//change css on network and profilepages
+$cssFile = null;
+
+
+/**
+ * prints last community activity
+ */
+function diabook_blue_community_info(){
+	$a = get_app();
+	//right_aside at networkpages
+
+	// last 12 users
+	$aside['$lastusers_title'] = t('Last users');
+	$aside['$lastusers_items'] = array();
+	$sql_extra = "";
+	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+	$order = " ORDER BY `register_date` DESC ";
+
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
+			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+		0,
+		9
+	);
+	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	if(count($r)) {
+		$photo = 'thumb';
+		foreach($r as $rr) {
+			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+			$entry = replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $profile_link,
+				'$photo' => $rr[$photo],
+				'$alt-text' => $rr['name'],
+			));
+			$aside['$lastusers_items'][] = $entry;
+		}
+	}
+	
+	
+	// last 10 liked items
+	$aside['$like_title'] = t('Last likes');
+	$aside['$like_items'] = array();
+	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
+			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
+				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
+			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
+			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
+			GROUP BY `uri`
+			ORDER BY `T1`.`created` DESC
+			LIMIT 0,5",
+			$a->get_baseurl(),$a->get_baseurl()
+			);
+
+	foreach ($r as $rr) {
+		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
+		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
+		
+		//var_dump($rr['verb'],$rr['object-type']); killme();
+		switch($rr['verb']){
+			case 'http://activitystrea.ms/schema/1.0/post':
+				switch ($rr['object-type']){
+					case 'http://activitystrea.ms/schema/1.0/event':
+						$post_type = t('event');
+						break;
+					default:
+						$post_type = t('status');
+				}
+				break;
+			default:
+				if ($rr['resource-id']){
+					$post_type = t('photo');
+					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
+					$rr['plink'] = $m[1];
+				} else {
+					$post_type = t('status');
+				}
+		}
+		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
+
+		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+		
+	}
+	
+	
+	// last 12 photos
+	$aside['$photos_title'] = t('Last photos');
+	$aside['$photos_items'] = array();
+	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
+				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
+					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
+						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
+				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
+				`user` 
+				WHERE `user`.`uid` = `photo`.`uid`
+				AND `user`.`blockwall`=0
+				AND `user`.`hidewall`=0
+				ORDER BY `photo`.`edited` DESC
+				LIMIT 0, 9",
+				dbesc(t('Contact Photos')),
+				dbesc(t('Profile Photos'))
+				);
+		if(count($r)) {
+		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		foreach($r as $rr) {
+			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
+			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
+		
+			$entry = replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $photo_page,
+				'$photo' => $photo_url,
+				'$alt-text' => $rr['username']." : ".$rr['desc'],
+			));
+
+			$aside['$photos_items'][] = $entry;
+		}
+	}
+	
+	$fostitJS = "javascript: (function() {
+    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    						a_funct = function() {
+        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
+    							else {a_funct()}})()" ;
+  
+   $aside['$fostitJS'] = $fostitJS;
+   
+   //nav FIND FRIENDS
+	if(local_user()) {
+	$nv = array();
+	$nv['directory'] = Array('directory', t('Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+						
+	$aside['$nv'] = $nv;
+	};
+	//Community Page
+	if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;
+	}		
+  //END Community Page		   
+   
+   
+   
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	
+}
+
+
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	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 = array('usermenu'=>array());
+		$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']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
+		$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'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] .= replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			));
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	
+	if($ccCookie != "8") {
+	// COMMUNITY
+	diabook_blue_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";
+	}
+}
+
+
+
+//right_aside at profile pages
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
+	if($ccCookie != "8") {
+	// COMMUNITY
+	diabook_blue_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";
+	}
+}
+
+
+// custom css
+if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+//load jquery.cookie.js
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS);
+
+
+//js scripts
+
+$a->page['htmlhead'] .= <<< EOT
+
+<script>
+ $(function() {
+	$('a.lightbox').fancybox(); // Select all links with lightbox class
+	
+ });
+
+</script>
+
+<script>
+
+$("right_aside").ready(function(){
+	
+	if($.cookie('close_pages') == '1') 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+	
+	if($.cookie('close_helpers') == '1') 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie('close_services') == '1') 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie('close_friends') == '1') 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie('close_postit') == '1') 
+		{
+		document.getElementById( "close_postit" ).style.display = "none";
+			};
+			
+	if($.cookie('close_lastusers') == '1') 
+		{
+		document.getElementById( "close_lastusers" ).style.display = "none";
+			};
+			
+	if($.cookie('close_lastphotos') == '1') 
+		{
+		document.getElementById( "close_lastphotos" ).style.display = "none";
+			};
+			
+	if($.cookie('close_lastlikes') == '1') 
+		{
+		document.getElementById( "close_lastlikes" ).style.display = "none";
+			};}
+
+);
+
+function close_pages(){
+ document.getElementById( "close_pages" ).style.display = "none";
+ $.cookie('close_pages','1', { expires: 365, path: '/' });
+ };
+ 
+function close_helpers(){
+ document.getElementById( "close_helpers" ).style.display = "none";
+  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+ };
+
+function close_services(){
+ document.getElementById( "close_services" ).style.display = "none";
+ $.cookie('close_services','1', { expires: 365, path: '/' });
+ };
+ 
+function close_friends(){
+ document.getElementById( "close_friends" ).style.display = "none";
+ $.cookie('close_friends','1', { expires: 365, path: '/' });
+ };
+
+function close_postit(){
+ document.getElementById( "close_postit" ).style.display = "none";
+ $.cookie('close_postit','1', { expires: 365, path: '/' });
+ };
+ 
+function close_lastusers(){
+ document.getElementById( "close_lastusers" ).style.display = "none";
+ $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ };
+
+function close_lastphotos(){
+ document.getElementById( "close_lastphotos" ).style.display = "none";
+ $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ };
+ 
+function close_lastlikes(){
+ document.getElementById( "close_lastlikes" ).style.display = "none";
+ $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ };
+
+function restore_boxes(){
+	$.cookie('close_pages','2', { expires: 365, path: '/' });
+	$.cookie('close_helpers','2', { expires: 365, path: '/' });
+	$.cookie('close_services','2', { expires: 365, path: '/' });
+	$.cookie('close_friends','2', { expires: 365, path: '/' });
+	$.cookie('close_postit','2', { expires: 365, path: '/' });
+	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
+	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
+	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
+	alert('Right-hand column was restored. Please refresh your browser');
+  }; 
+ 
+</script>
+
+EOT;
+

view/theme/diabook-aerith/wall_item.tpl

@@ -0,0 +1,100 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}				
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>

view/theme/diabook-aerith/wallwall_item.tpl

@@ -0,0 +1,102 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			<div class="contact-photo-wrapper mframe wwfrom"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>

view/theme/diabook-blue/communityhome.tpl

@@ -36,7 +36,7 @@
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>			
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
 $nv.search
 {{ endif }}
 </div>

view/theme/diabook-blue/style-network.css

@@ -797,7 +797,7 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #14618a; /*bdcdd4;*/
+  background-color: #308DBF; /*bdcdd4;*/
   color: #fff;
 }
 ul.menu-popup .menu-sep {

view/theme/diabook-blue/style-profile.css

@@ -798,7 +798,7 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #14618a; /*bdcdd4;*/
+  background-color: #308DBF; /*bdcdd4;*/
   color: #fff;
 }
 ul.menu-popup .menu-sep {

view/theme/diabook-blue/style.css

@@ -795,7 +795,7 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #14618a; /*bdcdd4;*/
+  background-color: #308DBF; /*bdcdd4;*/
   color: #fff;
 }
 ul.menu-popup .menu-sep {

view/theme/diabook-red/communityhome.tpl

@@ -0,0 +1,92 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+{{ endif }}
+</div>
+
+<div id="close_lastusers">
+{{ if $lastusers_title }}
+<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{ for $lastusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+
+{{ if $activeusers_title }}
+<h3>$activeusers_title</h3>
+<div class='items-wrapper'>
+{{ for $activeusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+
+<div id="close_lastphotos">
+{{ if $photos_title }}
+<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{ for $photos_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+<div id="close_lastlikes">
+{{ if $like_title }}
+<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
+<ul id='likes'>
+{{ for $like_items as $i }}
+	<li id='ra-photos-wrapper'>$i</li>
+{{ endfor }}
+</ul>
+{{ endif }}
+</div>

view/theme/diabook-red/contact_template.tpl

@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/diabook-red/directory_item.tpl

@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>

view/theme/diabook-red/fpostit/README

@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet

view/theme/diabook-red/fpostit/fpostit.js

@@ -0,0 +1,6 @@
+javascript: (function() {
+    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    						a_funct = function() {
+        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
+    							else {a_funct()}})()"

view/theme/diabook-red/fpostit/fpostit.php

@@ -0,0 +1,135 @@
+<?php
+if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
+	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+	<style>
+		body {
+			font-family: arial, Helvetica,sans-serif;
+			margin: 0px;
+		}
+		.wrap1 {
+			padding: 2px 5px;
+			background-color: #000;
+			margin-bottom: 10px;
+		}
+		.wrap2 {
+			margin-left: 10px;
+			font-size: 12px;
+		}
+		.logo {
+			margin-left: 3px;
+			margin-right: 5px;
+			float: left;
+		}
+		h2 {
+			color: #ffffff;
+		}
+		.error {
+			background-color: #FFFF66;
+			font-size: 12px;
+			margin-left: 10px;
+		}
+	</style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+	$title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+	$text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+	$url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+	$content = "$title\nsource:$url\n\n$text";
+} else {
+	$content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+	
+	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+		$acctname = $_POST["friendika_acct_name"];
+		$tmp_account_array = explode("@", $acctname);
+		if (isset($tmp_account_array[1])) {
+			$username = $tmp_account_array[0];
+			$hostname = $tmp_account_array[1];
+		}
+		$password = $_POST["friendika_password"];
+		$content = $_POST["content"];
+
+		$url = "http://" . $hostname . '/api/statuses/update';
+		$data = array('status' => $content);
+		
+		// echo "posting to: $url<br/>";
+
+		$c = curl_init();
+		curl_setopt($c, CURLOPT_URL, $url); 
+		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
+		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+		$c_result = curl_exec($c); 
+		if(curl_errno($c)){ 
+			$error = curl_error($c);
+			showForm($error, $content);
+		}
+		
+		curl_close($c);
+		if (!isset($error)) {
+			echo '<script language="javascript" type="text/javascript">window.close();</script>';
+		}
+		
+	} else {
+		$error = "Missing account name and/or password...try again please";
+		showForm($error, $content);
+	}
+	
+} else {
+	showForm(null, $content);
+}
+
+function showForm($error, $content) {
+	$username_cookie = $_COOKIE['username'];
+	$password_cookie = $_COOKIE['password'];
+	
+	echo <<<EOF
+	<div class='wrap1'>
+		<h2><img class='logo' src='friendika-32.png' align='middle';/>
+		Friendika Bookmarklet</h2>
+	</div>
+
+	<div class="wrap2">
+		<form method="post" action="{$_SERVER['PHP_SELF']}">
+			Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
+			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
+		</form>
+		<p></p>
+	</div>
+EOF;
+	
+}
+?>
+
+</body>
+</html>

view/theme/diabook-red/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>	
+