Merge remote-tracking branch 'upstream/master'

README

@@ -1,4 +1,11 @@
 Friendica Social Communications Server
 ======================================
 
+http://friendica.com
+
 Welcome to the free social web.
+
+
+Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers.
+
+Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.  

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1273' );
+define ( 'FRIENDICA_VERSION',      '2.3.1275' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );
 

include/items.php

@@ -1756,7 +1756,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
 
-				if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$contact['url']))) {
+				if(! link_compare($datarray['owner-link'],$contact['url'])) {
 					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
 					// but otherwise there's a possible data mixup on the sender's system.
 					// the tgroup delivery code called from item_store will correct it if it's a forum,
@@ -2477,7 +2477,7 @@ function local_delivery($importer,$data) {
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
 
-			if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$importer['url']))) {
+			if(! link_compare($datarray['owner-link'],$contact['url'])) {
 				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
 				// but otherwise there's a possible data mixup on the sender's system.
 				// the tgroup delivery code called from item_store will correct it if it's a forum,

include/notifier.php

@@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
 		// by stringing togther an array of retractions and sending them onward.
 		 
   	
-		$localhost = $a->get_hostname();
+		$localhost = str_replace('www.','',$a->get_hostname());
 		if(strpos($localhost,':'))
 			$localhost = substr($localhost,0,strpos($localhost,':'));
 

include/security.php

@@ -213,3 +213,77 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 	}
 	return $sql;
 }
+
+
+function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+
+	$local_user = local_user();
+	$remote_user = remote_user();
+
+	/**
+	 * Construct permissions
+	 *
+	 * default permissions - anonymous user
+	 */
+
+	$sql = " AND allow_cid = '' 
+			 AND allow_gid = '' 
+			 AND deny_cid  = '' 
+			 AND deny_gid  = '' 
+			 AND private = 0
+	";
+
+	/**
+	 * Profile owner - everything is visible
+	 */
+
+	if(($local_user) && ($local_user == $owner_id)) {
+		$sql = ''; 
+	}
+
+	/**
+	 * Authenticated visitor. Unless pre-verified, 
+	 * check that the contact belongs to this $owner_id
+	 * and load the groups the visitor belongs to.
+	 * If pre-verified, the caller is expected to have already
+	 * done this and passed the groups into this function.
+	 */
+
+	elseif($remote_user) {
+
+		if(! $remote_verified) {
+			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
+				intval($remote_user),
+				intval($owner_id)
+			);
+			if(count($r)) {
+				$remote_verified = true;
+				$groups = init_groups_visitor($remote_user);
+			}
+		}
+		if($remote_verified) {
+		
+			$gs = '<<>>'; // should be impossible to match
+
+			if(is_array($groups) && count($groups)) {
+				foreach($groups as $g)
+					$gs .= '|<' . intval($g) . '>';
+			} 
+
+			$sql = sprintf(
+				" AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
+				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
+				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
+				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s'))) 
+				",
+				intval($remote_user),
+				intval($remote_user),
+				dbesc($gs),
+				dbesc($gs)
+			);
+		}
+	}
+	return $sql;
+}
+
+

js/fk.autocomplete.js

@@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
 		}
 		else {
 			txt = tinyMCE.activeEditor.getContent();
+			//			alert(that.searchText + ':' + t);
 			newtxt = txt.replace(that.searchText,t+' ');
 			tinyMCE.activeEditor.setContent(newtxt);
 			tinyMCE.activeEditor.focus();

mod/display.php

@@ -34,7 +34,7 @@ function display_content(&$a) {
 
 	$contact = null;
 	$remote_contact = false;
-dbg(1);
+
 	if(remote_user()) {
 		$contact_id = $_SESSION['visitor_id'];
 		$groups = init_groups_visitor($contact_id);
@@ -85,10 +85,7 @@ dbg(1);
 		$o .= status_editor($a,$x,0,true);
 
 
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
-
-	if(! local_user() && ! remote_user())
-		$sql_extra .= " and `item`.`private` = 0 ";
+	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -138,7 +135,7 @@ dbg(1);
 		}
 
 	}
-dbg(0);
+
 	return $o;
 }
 

mod/network.php

@@ -470,7 +470,7 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			foreach($r as $rr)
-				if(! array_key_exists($rr['item_id'],$parents_arr))
+				if(! in_array($rr['item_id'],$parents_arr))
 					$parents_arr[] = $rr['item_id'];
 			$parents_str = implode(', ', $parents_arr);
 

mod/profile.php

@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
 	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 	 */
 
-	$sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
 	if($update) {

view/ca/cmnt_received_eml.tpl

@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha comentat un element/conversació que estàs seguint.
+
+-----
+$body
+-----
+
+Accedeix a $siteurl per a veure la conversa completa:
+
+$display
+
+
+	$sitename
+
+ 
+

view/ca/follow_notify_eml.tpl

@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Tens un nou seguidor en $sitename -  '$requestor'.
+
+Pots visitar el seu perfil en $url.
+
+Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud.
+
+$siteurl
+
+
+	$sitename 

view/ca/friend_complete_eml.tpl

@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+	Grans noticies... '$fn' a '$dfrn_url' ha acceptat la teva sol·licitud de connexió en '$sitename'.
+
+Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic
+sense cap restricció.
+
+Visita la teva pàgina de 'Contactes' en $sitename si desitja realizar qualsevol canvi en aquesta relació.
+
+$siteurl
+
+[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general 
+- i assignar drets de visualització a '$fn'].
+
+
+	$sitename
+
+ 

view/ca/htconfig.tpl

@@ -0,0 +1,68 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '$dbhost';
+$db_user = '$dbuser';
+$db_pass = '$dbpass';
+$db_data = '$dbdata';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set $a->path to 'directory/subdirectory'. 
+
+$a->path = '$urlpath';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '$timezone';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Meva Xarxa d'Amics";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '$adminmail';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+

view/ca/intro_complete_eml.tpl

@@ -0,0 +1,21 @@
+
+Apreciat/da $username,
+
+	'$fn' en '$dfrn_url' ha acceptat la teva petició
+connexió a '$sitename'.
+
+	'$fn' ha optat per acceptar-te com a "fan", que restringeix certes 
+formes de comunicació, com missatges privats i algunes interaccions 
+amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, 
+aquests ajustos s'aplican automàticament 
+
+	'$fn' pot optar per extendre aixó en una relació més permisiva
+en el futur.
+
+	Començaràs a rebre les actualizacions públiques de estatus de '$fn', 
+que apareixeran a la teva pàgina "Xarxa" en
+
+$siteurl
+
+
+	$sitename

view/ca/lostpass_eml.tpl

@@ -0,0 +1,35 @@
+
+Apreciat/da $username,
+	
+	S'ha rebut una sol·licitud en $sitename recentment per restablir
+la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
+verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+
+Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
+i/o elimina aquest missatge.
+
+La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
+va emetre aquesta sol·licitud.
+
+Segueix aquest enllaç per verificar la teva identitat:
+
+$reset_link
+
+A continuació rebràs un missatge amb la nova contrasenya.
+
+Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
+configuració.
+
+Les dades d'accés són els següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+
+
+
+
+Salutacions,
+	L'administració de $sitename
+
+ 

view/ca/mail_received_html_body_eml.tpl

@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Mensaje de Friendica</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Has rebut un nou missatge privat de '$from' en $siteName.</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedeix a <a href="$siteurl">$siteurl</a> per a llegir i respondre als teus missatges privats.</td></tr>
+	<tr><td></td><td>$siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>

view/ca/mail_received_text_body_eml.tpl

@@ -0,0 +1,9 @@
+Has rebut un nou missatge privat de '$from' en $siteName.
+	
+$title
+
+$textversion
+				
+Accedeix a $siteurl per a llegir i respondre als teus missatges privats.
+
+	$siteName

view/ca/passchanged_eml.tpl

@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
+(o canvía immediatament la contrasenya amb quelcom que recordis).
+
+
+Les teves dades d'accés son les següents:
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$new_password
+
+Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+
+
+	$sitename
+
+ 

view/ca/register_open_eml.tpl

@@ -0,0 +1,22 @@
+
+Apreciat/da $username,
+
+	Gràcies per registrar-te en $sitename. El teu compte ha estat creat.
+
+
+Les dades d'accés són les següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$password
+
+
+Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
+
+Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
+
+
+Gràcies i benvingut/da $sitename.
+
+ 

view/ca/register_verify_eml.tpl

@@ -0,0 +1,23 @@
+
+S'ha rebut la sol·licitud de registre d'un nou usuari en
+$sitename que requereix la teva aprovació.
+
+Les dades d'accés són els següents:
+
+Nom Complet: $username
+Lloc: $siteurl
+Nom: $email
+
+
+Per aprovar aquesta sol·licitud, visita el següent enllaç:
+
+$siteurl/regmod/allow/$hash
+
+Per denegar la sol·licitud i eliminar el compte, per favor visita:
+
+$siteurl/regmod/deny/$hash
+
+
+Gràcies.
+
+

view/ca/request_notify_eml.tpl

@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Acabes de rebre una sol·licitud de connexió de '$requestor' en $sitename.
+
+Pots visitar el seu perfil en $url.
+
+Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud.
+
+$siteurl
+
+
+	$sitename

view/ca/wall_received_eml.tpl

@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha escrit quelcom en el mur del teu perfil.
+
+-----
+$body
+-----
+
+Accedeix a  $siteurl per a veure o esborrar l'element:
+
+$display
+
+
+	$sitename
+
+ 
+

view/theme/diabook-blue/comment_item.tpl

@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/diabook-blue/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-blue/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-blue/nav.tpl

@@ -0,0 +1,190 @@
+<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.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.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
+										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										
+										<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.home }}
+			<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: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 25px; 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-blue/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="175" height="175" 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-blue/wall_item.tpl

@@ -0,0 +1,100 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<span class="icon isstar $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<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-location">$item.location&nbsp;</div>
+			<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="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do" >
+					<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">
+					<img src="images/star_dummy.png" class="icon star" alt="$item.star.undo" /> </a>
+				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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>
+	</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/wallwall_item.tpl

@@ -0,0 +1,106 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<span class="icon isstar $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<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-location">$item.location&nbsp;</div>
+			<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="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do" >
+					<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">
+					<img src="images/star_dummy.png" class="icon star" alt="$item.star.undo" /> </a>
+				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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>
+	</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/comment_item.tpl

@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/diabook/nav.tpl

@@ -1,7 +1,4 @@
 <header>
-	
-	
-	
 	<div id="site-location">$sitelocation</div>
 	<div id="banner">$banner</div>
 </header>
@@ -76,7 +73,7 @@
 
 										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
 										
-										<li><a class="$nav.search.2" href="friendica" title="About" >About</a></li>
+										<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 }}
@@ -119,7 +116,8 @@
 						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
 					{{ endfor }}
 					
-					{{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ 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>
@@ -136,11 +134,21 @@
 		
 	</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: 5px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
+<div style="position: fixed; bottom: 25px; 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>
+
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>

view/theme/diabook/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="175" height="175" 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/style.css

@@ -214,6 +214,17 @@
   padding: 1px;
 }
 
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
 .icon.text {
   text-indent: 0px;
 }
@@ -537,7 +548,8 @@ header #banner #logo-img {
 }
 header #banner #logo-text {
   font-size: 22px;
-  
+  position: absolute;
+  top: 15%;
 }
 /* nav */
 nav {
@@ -619,9 +631,17 @@ nav .nav-menu-search {
   margin: 3px 17px;
   margin-right: 0px;
   height: 17px;
-  width: 205px;
+  width: 180px;
+  
 }
 
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+	}
+
+
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
@@ -871,14 +891,14 @@ aside .vcard dl {
 aside .vcard dt {
   float: left;
   margin-left: 0px;
-  width: 35%;
+  /*width: 35%;*/
   text-align: right;
   color: #999999;
 }
 aside .vcard dd {
   float: left;
-  margin-left: 4px;
-  width: 60%;
+  margin-left: 5px;
+  /*width: 60%;*/
 }
 aside #profile-extra-links ul {
   padding: 0px;
@@ -1016,6 +1036,12 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+}	
+
 .tabs {
     
     background-position: 0 -20px;
@@ -1033,6 +1059,10 @@ section {
     padding: 3px;
     color:  #333333;
 	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
 /* wall item */
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
@@ -1914,6 +1944,9 @@ box-shadow: 1px 1px 5px 0;
 #group-members-end {
         clear: both;
 }
+#group-edit-desc {
+ margin-top: 15px;
+}
 
 /*
 #group-separator,
@@ -2121,11 +2154,24 @@ a.mail-list-link {
 #photo-photo {
         float: left;
 }
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
 
 #photo-photo-end {
         clear: both;
 }
 
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
 .profile-match-photo {
         float: left;
         text-align: center;

view/theme/dispy/jot-header.tpl

@@ -1,12 +1,7 @@
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
 <script type="text/javascript">
-
 var editor = false;
 var textlen = 0;
 var plaintext = '$editselect';
-// this is here because of the silly tinymce error. didn't help.
-var skin = 'default';
 
 function initEditor(cb) {
 	if (editor==false) {
@@ -119,7 +114,9 @@ function enableOnUser(){
 	$(this).val("");
 	initEditor();
 }
-
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
 	var ispublic = '$ispublic';
 	var addtitle = '$addtitle';
 
@@ -127,6 +124,7 @@ function enableOnUser(){
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
 		$("#profile-jot-text").focus(charCounter);
 		$("#profile-jot-text").click(charCounter);
 

view/theme/dispy/jot.tpl

@@ -12,46 +12,61 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
+		</textarea>
 
-		<div id="jot-tools" class="jothidden" style="display:none">
-			<span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span>
-			<span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span>
-			<span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span>
-			<span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span>
-			<span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span>
-			<span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span>
-			<span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span>
+
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
+
+		<div id="profile-upload-wrapper" style="display: $visitor;">
+			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
+		</div>
+		<div id="profile-attach-wrapper" style="display: $visitor;">
+			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+		</div>
+		<div id="profile-video-wrapper" style="display: $visitor;">
+			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+		</div>
+		<div id="profile-audio-wrapper" style="display: $visitor;">
+			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+		</div>
+		<div id="profile-location-wrapper" style="display: $visitor;">
+			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;">
+			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+		</div>
+
+		<div id="profile-jot-plugin-wrapper">
 		$jotplugins
-			<ul id="profile-jot-submit-wrapper">
-				<li>
+		</div>
+
 	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
-				</li>
-
-				<li id="profile-jot-perms" class="profile-jot-perms">
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
 		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
-				</li>
-
-				<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-
-			</ul>
-			<span id="profile-rotator" class="loading" style="display: none">
-				<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
 	</div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
 	</div>
 
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
+	
 	<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" />
+			<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>
-
 {{ if $content }}<script>initEditor();</script>{{ endif }}

view/theme/dispy/style.css

@@ -143,7 +143,10 @@ a:hover {
 }
 .required {
     display: inline;
-    color: #ff0000;
+    color: #ff0;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
 }
 .fakelink, .lockview {
     color: #3465a4;
@@ -584,26 +587,26 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	border:2px solid #f8911b;
 	border-bottom:0;
 	padding-bottom: 50px;
-	z-index:1000;
+	z-index: 1000;
 }
 #sysmsg {
-	position:fixed;
-	bottom:0;
-	-moz-box-shadow:0 0 5px #888;
-	-webkit-box-shadow:0 0 5px #888;
-	box-shadow:0 0 5px #888;
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 0 0 5px #888;
+	-webkit-box-shadow: 0 0 5px #888;
+	box-shadow: 0 0 5px #888;
     padding: 10px;
-	background-color:#fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom:0;
+	background-color: #fcaf3e;
+	border: 2px solid #f8911b;
+	border-bottom: 0;
 	padding-bottom: 50px;
-	z-index:1000;
+	z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display:block;
-	margin:2px 0px;
-	border-top:1px solid #ccccce;
+	display: block;
+	margin: 2px 0px;
+	border-top: 1px solid #ccccce;
 }
 
 
@@ -613,7 +616,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 aside {
     position: absolute;
     right: 15px;
-    width: 230px;
+    width: 245px;
+	padding-top: 15px;
     font-size: smaller;
 }
 .vcard .fn {
@@ -687,7 +691,7 @@ aside #viewcontacts {
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
-  height: 40px;
+  height: 35px;
   overflow: none;
   width: 100%;
   /*background-color: #0e232e;*/
@@ -757,28 +761,21 @@ aside #viewcontacts {
     margin-top: 10px;
 }
 #jot #jot-title {
-    border: 0px;
+	border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
 	vertical-align: middle;
-	padding: 5px 1px;
-}
-#jot #jot-title:hover,
-#jot #jot-title:focus {
-  border: 1px solid #999;
-  border-radius: 5px;
 }
 #jot #character-counter {
-  width: 40px;
+	width: 6%;
 	float: right;
 	text-align: right;
-  height: 20px;
+	height: 15px;
 	line-height: 20px;
-  padding: 5px;
-  margin: 0 0 5px;
+	padding: 2px 20px 5px 0;
 }
 #profile-jot-text_tbl {
 	margin-bottom: 10px;
@@ -787,15 +784,15 @@ aside #viewcontacts {
 	width:99.900002% !important;
 }
 #profile-attach-wrapper,
-#profile-audio,
+#profile-audio-wrapper,
 #profile-link-wrapper,
-#profile-location,
-#profile-nolocation,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
 #profile-title-wrapper,
 #profile-upload-wrapper,
-#profile-video {
+#profile-video-wrapper {
     float: left;
-    margin-left: 10px;
+	margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
 	float: right; 
@@ -826,9 +823,10 @@ aside #viewcontacts {
 	padding: 5px;
 }
 #jot-preview-link {
-    margin: 0 0 0 25px;
+    margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
+	float: right;
 }
 .icon-text-preview {
 	margin: 0 0 -18px 0;
@@ -838,9 +836,10 @@ aside #viewcontacts {
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
+	float: right;
 }
 #profile-jot-perms { 
-	/*float: right;*/
+	float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -851,17 +850,18 @@ aside #viewcontacts {
     border: 0px;
     margin: 0 -4px 0 10px;
 }
+#profile-jot-plugin-wrapper {
+	width: 1px;
+	margin: 10px 0 0 0;
+	float: right;
+}
 #profile-jot-submit-wrapper {
 	float: right;
-	width: 30%;
+	width: 100%;
 	list-style: none;
 	margin: 10px 0 0 0;
 	padding: 0;
 }
-#profile-jot-submit-wrapper li {
-	display: inline-block;
-	vertical-align: middle;
-}
 #profile-jot-submit {
 	height: 22px;
 	background-color: #555753;
@@ -871,6 +871,7 @@ aside #viewcontacts {
 	border-radius: 0 5px 5px 0;
 	border: 0;
 	margin: 0;
+	float: right;
 }
 #jot-perms-icons {
 	background-color: #555753;
@@ -956,7 +957,7 @@ aside #viewcontacts {
 section {
     margin: 20px 6% 0 4%;
     font-size: 0.8em;
-    padding-right: 220px;
+    padding-right: 230px;
 	min-width: 475px;
 }
 
@@ -1013,12 +1014,12 @@ section {
 .wall-item-content {
 	overflow-x: auto;
 }
+/* removing it from here, vs. putting it in .wall-item-content
+ * might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
-	/*border: 1px #aaa solid;*/
-	/*border-radius: 5px;*/
     padding: 0px;
-	overflow-x: auto;
+	/*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1159,7 +1160,7 @@ section {
 	position: absolute;
 	left: -2px; top: 101px;
 	display: none;
-	z-index: 10000;
+	z-index: 10003;
 	-webkit-border-radius: 0px 5px 5px 5px;
 	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
@@ -1731,11 +1732,10 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin-top: 0px;
+    margin: 5px 2px 0 0;
 }
 .profile-edit-side-link {
     float: right;
-    margin: 0px 20px -18px 0;
 }
 .profile-listing {
     float: left;
@@ -2124,8 +2124,6 @@ div[id$="wrapper"] br {
 }
 .field textarea {
     width: 80%;
-}
-.field textarea {
     height: 100px;
 }
 .field_help {
@@ -2157,7 +2155,6 @@ div[id$="wrapper"] br {
 .hidden {
     display:none !important;
 }
-
 .field.radio .field_help {
     margin-left: 0;
 }
@@ -2285,12 +2282,12 @@ div[id$="wrapper"] br {
 .icon.drophide, .icon.delete {
     float: left;
 }
-.icon.s22 {
+/*.icon.s22 {
 	display: block;
 	background: url(icons.png) no-repeat;
 	width: 22px;
 	height: 22px;
-}
+}*/
 .icon.s22.delete {
 	display: block;
 	background-position: -110px 0;
@@ -2581,17 +2578,17 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height:150px;
-	background-color:#555753;
-	color: #FFFFFF;
-	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
+	max-height: 150px;
+	background-color: #555753;
+	color: #fff;
+	overflow: auto;
+	z-index: 100000;
+	border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color:#555753;
+	background-color: #555753;
     padding: 4px;
-	clear:left;
+	clear: left;
 }
 .acpopupitem img {
 	float: left;

view/theme/testbubble/theme.php

@@ -0,0 +1,9 @@
+<?php
+
+/*
+ * Name: Test Bubble
+ * Version: 1.1
+ * Author: Anne Walk
+ * Author: Devlon Duthied
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
+ */