Merge remote-tracking branch 'friendika/master'

boot.php

@@ -8,9 +8,9 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
-define ( 'FRIENDIKA_VERSION',      '2.3.1117' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1119' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1092      );
+define ( 'DB_UPDATE_VERSION',      1093      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

database.sql

@@ -424,7 +424,9 @@ CREATE TABLE IF NOT EXISTS `user` (
   `deny_gid` mediumtext NOT NULL,
   `openidserver` text NOT NULL,
   PRIMARY KEY (`uid`), 
-  KEY `nickname` (`nickname`)
+  KEY `nickname` (`nickname`),
+  KEY `account_expired` (`account_expired`),
+  KEY `login_date` (`login_date`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 

include/Scrape.php

@@ -533,7 +533,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
 		if($twitter || ! $poll)
 			$check_feed = true;
-		if((! isset($vcard)) || (! $profile))
+		if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))
 			$check_feed = true;
 		if(($at_addr) && (! count($links)))
 			$check_feed = false;

include/conversation.php

@@ -220,7 +220,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 				$body = prepare_body($item,true);
 				
-				$treads[$treadsid] .= replace_macros($tpl,array(
+				$tmp_item = replace_macros($tpl,array(
 					'$id' => $item['item_id'],
 					'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 					'$profile_url' => $profile_link,
@@ -251,6 +251,11 @@ function conversation(&$a, $items, $mode, $update) {
 					'$wait' => t('Please wait'),
 				));
 
+				$arr = array('item' => $item, 'output' => $tmp_item);
+				call_hooks('display_item', $arr);
+
+				$treads[$treadsid] .= $arr['output'];
+
 			}
 
 		}

include/delivery.php

@@ -72,7 +72,7 @@ function delivery_run($argv, $argc){
 		$normal_mode = false;
 		$expire = true;
 		$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 
-			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 30 MINUTE",
+			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
 			intval($item_id)
 		);
 		$uid = $item_id;

include/nav.php

@@ -177,7 +177,7 @@ function nav_set_selected($item){
 		'profiles'		=> null,
 		'notifications'	=> null,
 		'messages'		=> null,
-		'directyory'	=> null,
+		'directory'	=> null,
 		'settings'		=> null,
 		'contacts'		=> null,
 	);

include/notifier.php

@@ -86,7 +86,7 @@ function notifier_run($argv, $argc){
 		$normal_mode = false;
 		$expire = true;
 		$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 
-			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
+			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE",
 			intval($item_id)
 		);
 		$uid = $item_id;

include/poller.php

@@ -44,6 +44,12 @@ function poller_run($argv, $argc){
 		AND `account_expires_on` != '0000-00-00 00:00:00' 
 		AND `account_expires_on` < UTC_TIMESTAMP() ");
   
+	$abandon_days = intval(get_config('system','account_abandon_days'));
+	if($abandon_days < 1)
+		$abandon_days = 0;
+
+	
+
 	// once daily run expire in background
 
 	$d1 = get_config('system','last_expire_day');
@@ -92,12 +98,17 @@ function poller_run($argv, $argc){
 	// and which have a polling address and ignore Diaspora since 
 	// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
 
+	$abandon_sql = (($abandon_days) 
+		? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) 
+		: '' 
+	);
+
 	$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
 		AND `network` != '%s'
 		$sql_extra 
 		AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
-		AND `user`.`account_expired` = 0 ORDER BY RAND()",
+		AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
 		intval(CONTACT_IS_SHARING),
 		intval(CONTACT_IS_FRIEND),
 		dbesc(NETWORK_DIASPORA)

index.php

@@ -140,7 +140,6 @@ call_hooks('app_menu', $arr);
 
 $a->apps = $arr['app_menu'];
 
-
 /**
  *
  * We have already parsed the server path into $a->argc and $a->argv

mod/admin.php

@@ -177,6 +177,8 @@ function admin_page_site_post(&$a){
 	
 	
 	$register_policy	=	((x($_POST,'register_policy'))	? intval(trim($_POST['register_policy']))	:  0);
+	$abandon_days	    =	((x($_POST,'abandon_days'))	    ? intval(trim($_POST['abandon_days']))	    :  0);
+
 	$register_text		=	((x($_POST,'register_text'))	? notags(trim($_POST['register_text']))		: '');	
 	
 	$allowed_sites		=	((x($_POST,'allowed_sites'))	? notags(trim($_POST['allowed_sites']))		: '');
@@ -215,6 +217,7 @@ function admin_page_site_post(&$a){
 	set_config('system','maximagesize', $maximagesize);
 	
 	set_config('config','register_policy', $register_policy);
+	set_config('system','account_abandon_days', $abandon_days);
 	set_config('config','register_text', $register_text);
 	set_config('system','allowed_sites', $allowed_sites);
 	set_config('system','allowed_email', $allowed_email);
@@ -314,6 +317,7 @@ function admin_page_site(&$a) {
 
 		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
 		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."),
+		'$abandon_days'     => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
 		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
 		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),

mod/hostxrd.php

@@ -5,9 +5,34 @@ require_once('include/crypto.php');
 function hostxrd_init(&$a) {
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
+	$pubkey = get_config('system','site_pubkey');
+
+	if(! $pubkey) {
+
+		// should only have to ever do this once.
+
+		$res=openssl_pkey_new(array(
+			'digest_alg' => 'sha1',
+			'private_key_bits' => 4096,
+			'encrypt_key' => false ));
+
+
+		$prvkey = '';
+
+		openssl_pkey_export($res, $prvkey);
+
+		// Get public key
+
+		$pkey = openssl_pkey_get_details($res);
+		$pubkey = $pkey["key"];
+
+		set_config('system','site_prvkey', $prvkey);
+		set_config('system','site_pubkey', $pubkey);
+	}
+
 	$tpl = file_get_contents('view/xrd_host.tpl');
 	echo str_replace(array(
-		'$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
 	session_write_close();
 	exit();
 

mod/network.php

@@ -78,23 +78,25 @@ function network_init(&$a) {
 	
 	// network links moved to content to match other pages
 	// all
-	$a->page['content'] .= '<a class="tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/' 
+	// added 'button' class for easier styling - not the best place for it, should be moved into the tpl like profile_tabs.tpl
+	// once there is a network_tabs.tpl or something
+	$a->page['content'] .= '<a class="button tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/' 
 		. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' 
 		. t('All') . '</a>';
 		
 	// new
-	$a->page['content'] .= '<a class="tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/' 
+	$a->page['content'] .= '<a class="button tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/' 
 		. str_replace('/new', '', $a->cmd) . '/new' 
 		. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' 
 		. t('New') . '</a>';
 	
 	// starred
-	$a->page['content'] .= '<a class="tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
+	$a->page['content'] .= '<a class="button tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
 		. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >' 
 		. t('Starred') . '</a>';
 	
 	// bookmarks
-	$a->page['content'] .= '<a class="tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
+	$a->page['content'] .= '<a class="button tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
 		. str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' 
 		. t('Bookmarks') . '</a>';
 	

mod/profiles.php

@@ -359,7 +359,7 @@ function profiles_content(&$a) {
 
 
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
-		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>";
+		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
 
 		$f = get_config('system','birthday_input_format');
 		if(! $f)

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1092 );
+define( 'UPDATE_VERSION' , 1093 );
 
 /**
  *
@@ -770,3 +770,7 @@ function update_1091() {
 
 }
 
+function update_1092() {
+	q("ALTER TABLE `user` ADD INDEX ( `login_date` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `account_expired` ) ");
+}

view/admin_aside.tpl

@@ -12,26 +12,26 @@
 </script>
 <h4><a href="$admurl">Admin</a></h4>
 <ul class='admin linklist'>
-	<li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+	<li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+	<li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+	<li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
 </ul>
 
 <ul class='admin linklist'>
-	<li class='admin link $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
 </ul>
 
 
 {{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
 <ul class='admin linklist'>
 	{{ for $admin.plugins_admin as $l }}
-	<li class='admin link $l.2'><a href='$l.0'>$l.1</a></li>
+	<li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
 	{{ endfor }}
 </ul>
 	
 	
 <h4>Logs</h4>
 <ul class='admin linklist'>
-	<li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+	<li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
 </ul>
 

view/admin_site.tpl

@@ -43,6 +43,7 @@
 	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	

view/apps.tpl

@@ -2,6 +2,6 @@
 
 <ul>
 	{{ for $apps as $ap }}
-	<li><a href="$ap.url">$ap.name</a></li>
+	<li>$ap</li>
 	{{ endfor }}
 </ul>

view/contact_edit.tpl

@@ -35,7 +35,7 @@ $nettype
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
 			<div id="contact-edit-poll-text">$updpub</div>
 			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
+			<div id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></div>
 		</div>
 		{{ endif }}
 	</div>

view/contact_template.tpl

@@ -1,7 +1,7 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
 	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo" id="contact-entry-photo-$id"
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$id"
 		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
 
 			<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>

view/de/messages.po

@@ -2,15 +2,18 @@
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 
-#   <tobias.diekershoff@gmx.net>, 2011.
+# Translators:
 # bavatar <tobias.diekershoff@gmx.net>, 2011.
+# Erkan Yilmaz <erkan77@gmail.com>, 2011.
+#   <hzuehl@phone-talk.de>, 2011.
+#   <tobias.diekershoff@gmx.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendika\n"
 "Report-Msgid-Bugs-To: http://bugs.friendika.com/\n"
 "POT-Creation-Date: 2011-08-14 21:17-0700\n"
-"PO-Revision-Date: 2011-08-18 08:02+0000\n"
+"PO-Revision-Date: 2011-09-26 17:08+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Last-Translator: hauke <hzuehl@phone-talk.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendika/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -142,7 +145,7 @@ msgstr "Die Datei ist größer als das erlaubte Limit von %d"
 
 #: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
 msgid "File upload failed."
-msgstr "Upload der Datei fehlgeschlagen."
+msgstr "Hochladen der Datei fehlgeschlagen."
 
 #: ../../mod/fsuggest.php:63
 msgid "Friend suggestion sent."
@@ -290,7 +293,7 @@ msgstr "jeder"
 
 #: ../../mod/photos.php:132
 msgid "Contact information unavailable"
-msgstr "Kontakt Informationen nicht verfügbar"
+msgstr "Kontaktinformationen nicht verfügbar"
 
 #: ../../mod/photos.php:143 ../../mod/photos.php:577 ../../mod/photos.php:926
 #: ../../mod/photos.php:941 ../../mod/register.php:316
@@ -356,7 +359,7 @@ msgstr "Keine Bilder ausgewählt"
 
 #: ../../mod/photos.php:820
 msgid "Access to this item is restricted."
-msgstr "Zugriff zu diesem Eintrag wurde eingeschrängt."
+msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
 
 #: ../../mod/photos.php:884
 msgid "Upload Photos"
@@ -465,7 +468,7 @@ msgstr "Löschen"
 
 #: ../../mod/photos.php:1349
 msgid "Recent Photos"
-msgstr "Neuste Fotos"
+msgstr "Neueste Fotos"
 
 #: ../../mod/photos.php:1353
 msgid "Upload New Photos"
@@ -573,7 +576,7 @@ msgstr "Diese Vorstellung wurde bereits abgeschlossen."
 #: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
-"Profil Adresse ist ungültig oder stellt einige Profildaten nicht zur "
+"Profiladresse ist ungültig oder stellt einige Profildaten nicht zur "
 "Verfügung."
 
 #: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356
@@ -620,7 +623,7 @@ msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
 
 #: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
-msgstr "Freunde sind angehalten es in 24 Stunden erneut zu versuchen."
+msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
 
 #: ../../mod/dfrn_request.php:277
 msgid "Invalid locator"
@@ -628,7 +631,7 @@ msgstr "Ungültiger Locator"
 
 #: ../../mod/dfrn_request.php:296
 msgid "Unable to resolve your name at the provided location."
-msgstr "Unable to resolve your name at the provided location."
+msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden."
 
 #: ../../mod/dfrn_request.php:309
 msgid "You have already introduced yourself here."
@@ -657,7 +660,7 @@ msgstr "Deine Vorstellung wurde abgeschickt."
 
 #: ../../mod/dfrn_request.php:481
 msgid "Please login to confirm introduction."
-msgstr "Bitte melde dich an um die Vorstellung zu bestätigen."
+msgstr "Bitte melde dich an, um die Vorstellung zu bestätigen."
 
 #: ../../mod/dfrn_request.php:495
 msgid ""
@@ -675,7 +678,7 @@ msgstr "Willkommen zurück %s."
 #: ../../mod/dfrn_request.php:508
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
-msgstr "Bitte bestätige deine Vorstellung/Verbindungs Anfrage bei %s."
+msgstr "Bitte bestätige deine Vorstellung/Verbindungsanfrage bei %s."
 
 #: ../../mod/dfrn_request.php:509
 msgid "Confirm"
@@ -699,7 +702,7 @@ msgstr "Administrator"
 
 #: ../../mod/dfrn_request.php:630
 msgid "Friend/Connection Request"
-msgstr "Freundschafts/Kontakt Anfrage"
+msgstr "Freundschafts-/Kontaktanfrage"
 
 #: ../../mod/dfrn_request.php:631
 msgid ""
@@ -771,7 +774,7 @@ msgstr "Anfrage abschicken"
 #: ../../mod/install.php:34
 msgid "Could not create/connect to database."
 msgstr ""
-"Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank "
+"Konnte die Verbindung zur Datenbank nicht aufbauen, bzw. die Datenbank "
 "anlegen."
 
 #: ../../mod/install.php:39
@@ -784,7 +787,7 @@ msgstr "Mit der Installation fortfahren"
 
 #: ../../mod/install.php:77
 msgid "Your Friendika site database has been installed."
-msgstr "Die Datenbank deiner Friendika Seite wurde erfolgreich installiert."
+msgstr "Die Datenbank deiner Friendikaseite wurde erfolgreich installiert."
 
 #: ../../mod/install.php:78
 msgid ""
@@ -799,7 +802,7 @@ msgstr "Lies bitte die \"INSTALL.txt\"."
 
 #: ../../mod/install.php:81
 msgid "Proceed to registration"
-msgstr "Mit der Registration fortfahren"
+msgstr "Mit der Registrierung fortfahren"
 
 #: ../../mod/install.php:87
 msgid "Database import failed."
@@ -846,8 +849,9 @@ msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
-"Die Datenbank die du unten angibst sollte bereits existieren. Ist dies noch "
+"Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies "
-"nicht der Fall erzeuge sie bitte bevor du mit der Installation vorfährst."
+"noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation "
+"vorfährst."
 
 #: ../../mod/install.php:129
 msgid "Database Server Name"
@@ -867,16 +871,15 @@ msgstr "Datenbank Name"
 
 #: ../../mod/install.php:133
 msgid "Please select a default timezone for your website"
-msgstr "Bitte wähle die standard Zeitzone deiner Webseite"
+msgstr "Bitte wähle die Standardzeitzone deiner Webseite"
 
 #: ../../mod/install.php:134
 msgid ""
 "Site administrator email address. Your account email address must match this"
 " in order to use the web admin panel."
 msgstr ""
-"Email Adresse des Seiten Administrators. Die Email Adresse deines Accounts "
+"Emailadresse des Seitenadministrators. Die Emailadresse deines Accounts muss"
-"muss mit dieser übereinstimmen, damit du das Administrationspanel nutzen "
+" mit dieser übereinstimmen, damit du das Administrationspanel nutzen kannst."
-"kannst."
 
 #: ../../mod/install.php:153
 msgid "Could not find a command line version of PHP in the web server PATH."
@@ -956,8 +959,8 @@ msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr ""
-"Der Installationswizzard muss in der Lage sein eine Datei im "
+"Der Installationswizzard muss in der Lage sein, eine Datei im "
-"Stammverzeichnis deines Webservers anzuliegen ist allerdings derzeit nicht "
+"Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht "
 "in der Lage dies zu tun."
 
 #: ../../mod/install.php:217
@@ -996,7 +999,7 @@ msgstr ""
 
 #: ../../mod/install.php:243
 msgid "Errors encountered creating database tables."
-msgstr "Fehler aufgetreten wärend der Erzeugung der Datenbank Tabellen."
+msgstr "Fehler aufgetreten während der Erzeugung der Datenbank Tabellen."
 
 #: ../../mod/update_community.php:18 ../../mod/update_network.php:22
 #: ../../mod/update_profile.php:41
@@ -1005,7 +1008,7 @@ msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
 
 #: ../../mod/match.php:10
 msgid "Profile Match"
-msgstr "Profil Übereinstimmungen"
+msgstr "Profilübereinstimmungen"
 
 #: ../../mod/match.php:18
 msgid "No keywords to match. Please add keywords to your default profile."
@@ -1046,7 +1049,7 @@ msgstr "Ignorieren"
 
 #: ../../mod/notifications.php:74
 msgid "Pending Friend/Connect Notifications"
-msgstr "Anstehende Freundschafts/Kontakt Benachrichtigungen"
+msgstr "Anstehende Freundschafts-/Kontaktbenachrichtigungen"
 
 #: ../../mod/notifications.php:78
 msgid "Show Ignored Requests"
@@ -1058,11 +1061,11 @@ msgstr "Verberge ignorierte Anfragen"
 
 #: ../../mod/notifications.php:105 ../../mod/notifications.php:148
 msgid "Notification type: "
-msgstr "Benachrichtigungs Typ: "
+msgstr "Benachrichtigungstyp: "
 
 #: ../../mod/notifications.php:106
 msgid "Friend Suggestion"
-msgstr "Kontakt Vorschlag"
+msgstr "Kontaktvorschlag"
 
 #: ../../mod/notifications.php:108
 #, php-format
@@ -1143,7 +1146,7 @@ msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
 
 #: ../../mod/contacts.php:83
 msgid "Could not locate selected profile."
-msgstr "Konnte das ausgewählte Profiel nicht finden."
+msgstr "Konnte das ausgewählte Profil nicht finden."
 
 #: ../../mod/contacts.php:114
 msgid "Contact updated."
@@ -1155,7 +1158,7 @@ msgstr "Kontakt wurde blockiert"
 
 #: ../../mod/contacts.php:172
 msgid "Contact has been unblocked"
-msgstr "Kontakt wurde wieder frei gegeben"
+msgstr "Kontakt wurde wieder freigegeben"
 
 #: ../../mod/contacts.php:186
 msgid "Contact has been ignored"
@@ -1376,7 +1379,7 @@ msgstr "Passwort zurücksetzen"
 
 #: ../../mod/lostpass.php:83
 msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie gewünscht zurück gesetzt."
+msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt."
 
 #: ../../mod/lostpass.php:84
 msgid "Your new password is"
@@ -1508,7 +1511,7 @@ msgstr ""
 
 #: ../../mod/settings.php:394 ../../mod/admin.php:136 ../../mod/admin.php:446
 msgid "Automatic Friend Account"
-msgstr "Automatischer Freundes Account"
+msgstr "Automatischer Freundesaccount"
 
 #: ../../mod/settings.php:395
 msgid "Automatically approve all connection/friend requests as friends"
@@ -1575,7 +1578,7 @@ msgstr "Bestätigen:"
 
 #: ../../mod/settings.php:492
 msgid "Leave password fields blank unless changing"
-msgstr "Lass die Passwort-Felder leer außer du willst das Passwort ändern"
+msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
 #: ../../mod/settings.php:496
 msgid "Basic Settings"
@@ -1587,7 +1590,7 @@ msgstr "Kompletter Name:"
 
 #: ../../mod/settings.php:498
 msgid "Email Address:"
-msgstr "Email Adresse:"
+msgstr "Emailadresse:"
 
 #: ../../mod/settings.php:499
 msgid "Your Timezone:"
@@ -1964,7 +1967,7 @@ msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
 
 #: ../../mod/group.php:83 ../../mod/group.php:166
 msgid "Group Name: "
-msgstr "Gruppen Name:"
+msgstr "Gruppenname:"
 
 #: ../../mod/group.php:98
 msgid "Group removed."
@@ -1980,7 +1983,7 @@ msgstr "Klicke einen Kontakt an um ihn hinzuzufügen oder zu entfernen"
 
 #: ../../mod/group.php:165
 msgid "Group Editor"
-msgstr "Gruppen Editor"
+msgstr "Gruppeneditor"
 
 #: ../../mod/group.php:180
 msgid "Members"
@@ -2048,11 +2051,11 @@ msgstr "Die Domain deiner EMail Adresse ist nicht erlaubt auf dieser Seite."
 
 #: ../../mod/register.php:120
 msgid "Not a valid email address."
-msgstr "Keine gültige EMail Adresse."
+msgstr "Keine gültige EMailadresse."
 
 #: ../../mod/register.php:130
 msgid "Cannot use that email."
-msgstr "Konnte diese EMail Adresse nicht verwenden."
+msgstr "Konnte diese EMailadresse nicht verwenden."
 
 #: ../../mod/register.php:136
 msgid ""
@@ -2258,7 +2261,7 @@ msgstr "Bitte melde dich an."
 
 #: ../../mod/item.php:81
 msgid "Unable to locate original post."
-msgstr "Konnte das original Posting nicht finden."
+msgstr "Konnte das Originalposting nicht finden."
 
 #: ../../mod/item.php:196
 msgid "Empty post discarded."
@@ -2369,8 +2372,8 @@ msgstr "Bild Zurechtschneiden"
 #: ../../mod/profile_photo.php:210
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
-"Passe bitte den Bildausschnitt an damit das Bild optimal dargestellt werden "
+"Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden"
-"kann."
+" kann."
 
 #: ../../mod/profile_photo.php:211
 msgid "Done Editing"
@@ -2573,7 +2576,7 @@ msgstr "Erweitert"
 
 #: ../../mod/admin.php:306 ../../addon/statusnet/statusnet.php:459
 msgid "Site name"
-msgstr "Seiten Name"
+msgstr "Seitenname"
 
 #: ../../mod/admin.php:307
 msgid "Banner/Logo"
@@ -2581,7 +2584,7 @@ msgstr "Banner/Logo"
 
 #: ../../mod/admin.php:308
 msgid "System language"
-msgstr "System Sprache"
+msgstr "Systemsprache"
 
 #: ../../mod/admin.php:309
 msgid "System theme"
@@ -3022,7 +3025,7 @@ msgstr "Region/Bundesstaat:"
 
 #: ../../mod/profiles.php:387
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Beziehungs Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
 #: ../../mod/profiles.php:388
 msgid "Who: (if applicable)"
@@ -3212,7 +3215,7 @@ msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei"
 
 #: ../../mod/invite.php:103
 msgid "To accept this invitation, please visit:"
-msgstr "Um diese Einladung anzunehmen beuche bitte:"
+msgstr "Um diese Einladung anzunehmen besuche bitte:"
 
 #: ../../mod/invite.php:104
 msgid "You will need to supply this invitation code: $invite_code"
@@ -3222,7 +3225,7 @@ msgstr "Du benötigst den folgenden Einladungs Code: $invite_code"
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
-"Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:"
+"Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
 
 #: ../../mod/dfrn_confirm.php:233
 msgid "Response from remote site was not understood."
@@ -3267,7 +3270,7 @@ msgstr "Für '%s' wurde kein Nutzer gefunden"
 
 #: ../../mod/dfrn_confirm.php:517
 msgid "Our site encryption key is apparently messed up."
-msgstr "Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch."
+msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch."
 
 #: ../../mod/dfrn_confirm.php:528
 msgid "Empty site URL was provided or URL could not be decrypted by us."
@@ -3290,7 +3293,7 @@ msgstr ""
 #: ../../mod/dfrn_confirm.php:589
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
-"Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden."
+"Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
 
 #: ../../mod/dfrn_confirm.php:642
 msgid "Unable to update your contact profile details on our system"
@@ -3417,8 +3420,8 @@ msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr ""
-"Drei dimensionales Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur "
+"3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf "
-"das man es auf mehreren Ebenen gleichzeitig spielt."
+"mehreren Ebenen gleichzeitig spielt."
 
 #: ../../addon/tictac/tictac.php:61
 msgid ""
@@ -3632,7 +3635,7 @@ msgstr "Bei StatusNet anmelden"
 
 #: ../../addon/statusnet/statusnet.php:309
 msgid "Copy the security code from StatusNet here"
-msgstr "Kopiere den Sicherheitscode von StatusNet hier her"
+msgstr "Kopiere den Sicherheitscode von StatusNet hier hin"
 
 #: ../../addon/statusnet/statusnet.php:315
 msgid "Cancel Connection Process"
@@ -3788,7 +3791,7 @@ msgstr "Alter:"
 
 #: ../../include/profile_advanced.php:70
 msgid "<span class=\"heart\">&hearts;</span> Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Bezieungsstatus:"
+msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
 #: ../../include/profile_advanced.php:103 ../../boot.php:886
 msgid "Homepage:"
@@ -3880,7 +3883,7 @@ msgstr "Täglich"
 
 #: ../../include/contact_selectors.php:59
 msgid "Weekly"
-msgstr "Wöchendlich"
+msgstr "Wöchentlich"
 
 #: ../../include/contact_selectors.php:60
 msgid "Monthly"
@@ -3896,19 +3899,19 @@ msgstr "Weiblich"
 
 #: ../../include/profile_selectors.php:6
 msgid "Currently Male"
-msgstr "Momentan Männlich"
+msgstr "Momentan männlich"
 
 #: ../../include/profile_selectors.php:6
 msgid "Currently Female"
-msgstr "Momentan Weiblich"
+msgstr "Momentan weiblich"
 
 #: ../../include/profile_selectors.php:6
 msgid "Mostly Male"
-msgstr "Hauptsächlich Männlich"
+msgstr "Hauptsächlich männlich"
 
 #: ../../include/profile_selectors.php:6
 msgid "Mostly Female"
-msgstr "Hauptsächlich Weiblich"
+msgstr "Hauptsächlich weiblich"
 
 #: ../../include/profile_selectors.php:6
 msgid "Transgender"
@@ -3920,7 +3923,7 @@ msgstr "Intersex"
 
 #: ../../include/profile_selectors.php:6
 msgid "Transsexual"
-msgstr "Transsexuel"
+msgstr "Transsexuell"
 
 #: ../../include/profile_selectors.php:6
 msgid "Hermaphrodite"
@@ -3964,7 +3967,7 @@ msgstr "Keine Vorlieben"
 
 #: ../../include/profile_selectors.php:19
 msgid "Bisexual"
-msgstr "Bisexuel"
+msgstr "Bisexuell"
 
 #: ../../include/profile_selectors.php:19
 msgid "Autosexual"
@@ -4020,7 +4023,7 @@ msgstr "Untreu"
 
 #: ../../include/profile_selectors.php:33
 msgid "Sex Addict"
-msgstr "Sex Besessen"
+msgstr "Sexbesessen"
 
 #: ../../include/profile_selectors.php:33
 msgid "Friends"
@@ -4028,7 +4031,7 @@ msgstr "Freunde"
 
 #: ../../include/profile_selectors.php:33
 msgid "Friends/Benefits"
-msgstr "Friends/Benefits"
+msgstr "Freunde/Zuwendungen"
 
 #: ../../include/profile_selectors.php:33
 msgid "Casual"
@@ -4259,7 +4262,7 @@ msgstr "Persönlich"
 
 #: ../../include/nav.php:55
 msgid "Home Page"
-msgstr "Home Page"
+msgstr "Homepage"
 
 #: ../../include/nav.php:59
 msgid "Create an account"

view/de/strings.php

@@ -23,7 +23,7 @@ $a->strings["Submit"] = "Senden";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Help"] = "Hilfe";
 $a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
-$a->strings["File upload failed."] = "Upload der Datei fehlgeschlagen.";
+$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
 $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
 $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
@@ -57,7 +57,7 @@ $a->strings["%s welcomes %s"] = "%s heißt %s herzlich willkommen";
 $a->strings["Photo Albums"] = "Fotoalben";
 $a->strings["Contact Photos"] = "Kontaktbilder";
 $a->strings["everybody"] = "jeder";
-$a->strings["Contact information unavailable"] = "Kontakt Informationen nicht verfügbar";
+$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar";
 $a->strings["Profile Photos"] = "Profilbilder";
 $a->strings["Album not found."] = "Album nicht gefunden.";
 $a->strings["Delete Album"] = "Album löschen";
@@ -71,7 +71,7 @@ $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
 $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
 $a->strings["No photos selected"] = "Keine Bilder ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschrängt.";
+$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
 $a->strings["Upload Photos"] = "Bilder hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums: ";
 $a->strings["or existing album name: "] = "oder existierender Albumname: ";
@@ -96,7 +96,7 @@ $a->strings["Please wait"] = "Bitte warten";
 $a->strings["This is you"] = "Das bist du";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["Delete"] = "Löschen";
-$a->strings["Recent Photos"] = "Neuste Fotos";
+$a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Upload New Photos"] = "Weitere Fotos hochladen";
 $a->strings["View Album"] = "Album betrachten";
 $a->strings["Not available."] = "Nicht verfügbar.";
@@ -120,7 +120,7 @@ $a->strings["CC: email addresses"] = "CC: EMail Addresse";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
 $a->strings["This introduction has already been accepted."] = "Diese Vorstellung wurde bereits abgeschlossen.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "Profil Adresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
 $a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
 $a->strings["Warning: profile location has no profile photo."] = "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden.";
 $a->strings["%d required parameter was not found at the given location"] = array(
@@ -132,24 +132,24 @@ $a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler
 $a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
 $a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Freundschaftsanfragen erhalten.";
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten es in 24 Stunden erneut zu versuchen.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
-$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
+$a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
 $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits ein Freund von %s bist.";
 $a->strings["Invalid profile URL."] = "Ungültige Profil URL.";
 $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil URL.";
 $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
 $a->strings["Your introduction has been sent."] = "Deine Vorstellung wurde abgeschickt.";
-$a->strings["Please login to confirm introduction."] = "Bitte melde dich an um die Vorstellung zu bestätigen.";
+$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Vorstellung zu bestätigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Vorstellung/Verbindungs Anfrage bei %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Vorstellung/Verbindungsanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
 $a->strings["[Name Withheld]"] = "[Name Zurückgehalten]";
 $a->strings["Introduction received at "] = "Vorstellung erhalten auf";
 $a->strings["Administrator"] = "Administrator";
-$a->strings["Friend/Connection Request"] = "Freundschafts/Kontakt Anfrage";
+$a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Bitte beantworte folgende Fragen:";
 $a->strings["Does %s know you?"] = "Kennt %s dich?";
@@ -163,13 +163,13 @@ $a->strings["Private (secure) network"] = "Privates (sicheres) Netzwerk";
 $a->strings["Public (insecure) network"] = "Öffentliches (unsicheres) Netzwerk";
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
-$a->strings["Could not create/connect to database."] = "Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank anlegen.";
+$a->strings["Could not create/connect to database."] = "Konnte die Verbindung zur Datenbank nicht aufbauen, bzw. die Datenbank anlegen.";
 $a->strings["Connected to database."] = "Mit der Datenbank verbunden.";
 $a->strings["Proceed with Installation"] = "Mit der Installation fortfahren";
-$a->strings["Your Friendika site database has been installed."] = "Die Datenbank deiner Friendika Seite wurde erfolgreich installiert.";
+$a->strings["Your Friendika site database has been installed."] = "Die Datenbank deiner Friendikaseite wurde erfolgreich installiert.";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen cron Job (o.ä.) für den Poller einrichten.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
-$a->strings["Proceed to registration"] = "Mit der Registration fortfahren";
+$a->strings["Proceed to registration"] = "Mit der Registrierung fortfahren";
 $a->strings["Database import failed."] = "Import der Datenbank schlug fehl.";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
 $a->strings["Welcome to Friendika."] = "Willkommen bei Friendika.";
@@ -177,13 +177,13 @@ $a->strings["Friendika Social Network"] = "Friendika Soziales Netzwerk";
 $a->strings["Installation"] = "Installation";
 $a->strings["In order to install Friendika we need to know how to connect to your database."] = "Um Friendika installieren zu können, müssen wir wissen wie wir deine MySQL Datenbank erreichen.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite falls du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank die du unten angibst sollte bereits existieren. Ist dies noch nicht der Fall erzeuge sie bitte bevor du mit der Installation vorfährst.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation vorfährst.";
 $a->strings["Database Server Name"] = "Datenbank Server";
 $a->strings["Database Login Name"] = "Datenbank Nutzer";
 $a->strings["Database Login Password"] = "Datenbank Passwort";
 $a->strings["Database Name"] = "Datenbank Name";
-$a->strings["Please select a default timezone for your website"] = "Bitte wähle die standard Zeitzone deiner Webseite";
+$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite";
-$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = "Email Adresse des Seiten Administrators. Die Email Adresse deines Accounts muss mit dieser übereinstimmen, damit du das Administrationspanel nutzen kannst.";
+$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = "Emailadresse des Seitenadministrators. Die Emailadresse deines Accounts muss mit dieser übereinstimmen, damit du das Administrationspanel nutzen kannst.";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
 $a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "Diese wird von Friendika benötigt. Bitte passe die Konfigurationsdatei .htconfig.php entsprechend an.";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
@@ -196,14 +196,14 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl Modul von PHP ist nict installiert.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli Modul von PHP ist nicht installiert.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizzard muss in der Lage sein eine Datei im Stammverzeichnis deines Webservers anzuliegen ist allerdings derzeit nicht in der Lage dies zu tun.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizzard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage dies zu tun.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
 $a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team um diese Situations zu beheben.";
 $a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Sollte dies nicht möglich sein musst du die Installation manuell durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\".";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendika Installation zu erzeugen.";
-$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten wärend der Erzeugung der Datenbank Tabellen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbank Tabellen.";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
-$a->strings["Profile Match"] = "Profil Übereinstimmungen";
+$a->strings["Profile Match"] = "Profilübereinstimmungen";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
@@ -212,11 +212,11 @@ $a->strings["Welcome to %s"] = "Willkommen zu %s";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["Ignore"] = "Ignorieren";
-$a->strings["Pending Friend/Connect Notifications"] = "Anstehende Freundschafts/Kontakt Benachrichtigungen";
+$a->strings["Pending Friend/Connect Notifications"] = "Anstehende Freundschafts-/Kontaktbenachrichtigungen";
 $a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
 $a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
-$a->strings["Notification type: "] = "Benachrichtigungs Typ: ";
+$a->strings["Notification type: "] = "Benachrichtigungstyp: ";
-$a->strings["Friend Suggestion"] = "Kontakt Vorschlag";
+$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
 $a->strings["suggested by %s"] = "vorgeschlagen von %s";
 $a->strings["Approve"] = "Genehmigen";
 $a->strings["Claims to be known to you: "] = "Behauptet dich zu kennen: ";
@@ -238,10 +238,10 @@ $a->strings["Connect/Follow"] = "Verbinden/Folgen";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
 $a->strings["Follow"] = "Folge";
 $a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profiel nicht finden.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
 $a->strings["Contact updated."] = "Kontakt aktualisiert.";
 $a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
-$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder frei gegeben";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
 $a->strings["Contact has been ignored"] = "Der Kontakt wurde ignoriert";
 $a->strings["Contact has been unignored"] = "Kontakt wurde ignoriert";
 $a->strings["stopped following"] = "wird nicht mehr gefolgt";
@@ -290,7 +290,7 @@ $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Password Reset"] = "Passwort zurücksetzen";
-$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurück gesetzt.";
+$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt.";
 $a->strings["Your new password is"] = "Dein neues Passwort lautet";
 $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
 $a->strings["click here to login"] = "hier klicken um dich anzumelden";
@@ -319,7 +319,7 @@ $a->strings["Soapbox Account"] = "Sandkasten Account";
 $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert";
 $a->strings["Community/Celebrity Account"] = "Gemeinschafts/Berühmtheiten Account";
 $a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
-$a->strings["Automatic Friend Account"] = "Automatischer Freundes Account";
+$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount";
 $a->strings["Automatically approve all connection/friend requests as friends"] = "Freundschaftsanfragen werden automatisch als Freund akzeptiert";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID.";
@@ -335,10 +335,10 @@ $a->strings["Export Personal Data"] = "Perönliche Daten exportieren";
 $a->strings["Password Settings"] = "Passwort Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
 $a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer außer du willst das Passwort ändern";
+$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer du willst das Passwort ändern";
 $a->strings["Basic Settings"] = "Grundeinstellungen";
 $a->strings["Full Name:"] = "Kompletter Name:";
-$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Email Address:"] = "Emailadresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
 $a->strings["Default Post Location:"] = "Standardstandort:";
 $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:";
@@ -413,11 +413,11 @@ $a->strings["Group not found."] = "Gruppe nicht gefunden.";
 $a->strings["Group name changed."] = "Gruppenname geändert.";
 $a->strings["Permission denied"] = "Zugriff verweigert";
 $a->strings["Create a group of contacts/friends."] = "Eine Gruppe von Kontakten/Freunden anlegen.";
-$a->strings["Group Name: "] = "Gruppen Name:";
+$a->strings["Group Name: "] = "Gruppenname:";
 $a->strings["Group removed."] = "Gruppe entfernt.";
 $a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
 $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an um ihn hinzuzufügen oder zu entfernen";
-$a->strings["Group Editor"] = "Gruppen Editor";
+$a->strings["Group Editor"] = "Gruppeneditor";
 $a->strings["Members"] = "Mitglieder";
 $a->strings["All Contacts"] = "Alle Kontakte";
 $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner";
@@ -434,8 +434,8 @@ $a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Name
 $a->strings["Name too short."] = "Der Name ist zu kurz.";
 $a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
 $a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner EMail Adresse ist nicht erlaubt auf dieser Seite.";
-$a->strings["Not a valid email address."] = "Keine gültige EMail Adresse.";
+$a->strings["Not a valid email address."] = "Keine gültige EMailadresse.";
-$a->strings["Cannot use that email."] = "Konnte diese EMail Adresse nicht verwenden.";
+$a->strings["Cannot use that email."] = "Konnte diese EMailadresse nicht verwenden.";
 $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
 $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "SERIOUS ERROR: Generation of security keys failed.";
@@ -473,7 +473,7 @@ $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/A
 $a->strings["Account approved."] = "Account freigegeben.";
 $a->strings["Registration revoked for %s"] = "Registration für %s wurde zurück gezogen";
 $a->strings["Please login."] = "Bitte melde dich an.";
-$a->strings["Unable to locate original post."] = "Konnte das original Posting nicht finden.";
+$a->strings["Unable to locate original post."] = "Konnte das Originalposting nicht finden.";
 $a->strings["Empty post discarded."] = "Leere Nachricht wurde verworfen.";
 $a->strings["Wall Photos"] = "Pinnwand Bilder";
 $a->strings["noreply"] = "noreply";
@@ -495,7 +495,7 @@ $a->strings["Upload"] = "Hochladen";
 $a->strings["skip this step"] = "diesen Schritt überspringen";
 $a->strings["select a photo from your photo albums"] = "wähle ein Foto von deinen Fotoalben";
 $a->strings["Crop Image"] = "Bild Zurechtschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an damit das Bild optimal dargestellt werden kann.";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
 $a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
 $a->strings["Image uploaded successfully."] = "Bild erfolgreich auf den Server geladen.";
 $a->strings["No profile"] = "Kein Profil";
@@ -544,9 +544,9 @@ $a->strings["Open"] = "Offen";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
 $a->strings["Advanced"] = "Erweitert";
-$a->strings["Site name"] = "Seiten Name";
+$a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
-$a->strings["System language"] = "System Sprache";
+$a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
 $a->strings["Register policy"] = "Registrationsmethode";
@@ -653,7 +653,7 @@ $a->strings["Locality/City:"] = "Wohnort/Stadt:";
 $a->strings["Postal/Zip Code:"] = "Postleitzahl:";
 $a->strings["Country:"] = "Land:";
 $a->strings["Region/State:"] = "Region/Bundesstaat:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungs Status:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
 $a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiel: cathy123, Cathy Williams, cathy@example.com";
 $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
@@ -700,9 +700,9 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "Email Adressen eingeben, eine pro Zeile:";
 $a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei";
-$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen beuche bitte:";
+$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungs Code: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
 $a->strings["Response from remote site was not understood."] = "Antwort der entfernten Gegenstelle unverständlich.";
 $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
 $a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
@@ -712,11 +712,11 @@ $a->strings["Introduction failed or was revoked."] = "Vorstellung schlug fehl od
 $a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
 $a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
-$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch.";
+$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch.";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
 $a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal.";
-$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden.";
+$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
 $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
 $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
 $a->strings["Facebook disabled"] = "Facebook deaktiviert";
@@ -744,7 +744,7 @@ $a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
 $a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 $a->strings["New game"] = "Neues Spiel";
 $a->strings["New game with handicap"] = "Neues Handicap Spiel";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Drei dimensionales Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt.";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt.";
 $a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen.";
 $a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt.";
 $a->strings["You go first..."] = "Du fängst an...";
@@ -785,7 +785,7 @@ $a->strings["OAuth Consumer Secret"] = "OAuth Consumer Geheimnis";
 $a->strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)";
 $a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Um deinen Account mit einem StatusNet Account zu verknüpfen klicke den Button an um einen Sicherheitscode von StatusNet zu erhalten und kopiere diesen in die Eingabebox weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten bei StatusNet veröffentllicht.";
 $a->strings["Log in with StatusNet"] = "Bei StatusNet anmelden";
-$a->strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier her";
+$a->strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier hin";
 $a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen";
 $a->strings["Current StatusNet API is"] = "Derzeitige StatusNet API URL lautet";
 $a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen";
@@ -817,7 +817,7 @@ $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Age:"] = "Alter:";
-$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "<span class=\"heart\">&hearts;</span> Bezieungsstatus:";
+$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
 $a->strings["Homepage:"] = "Homepage:";
 $a->strings["Religion:"] = "Religion:";
 $a->strings["About:"] = "Über:";
@@ -840,17 +840,17 @@ $a->strings["Frequently"] = "Häufig";
 $a->strings["Hourly"] = "Stündlich";
 $a->strings["Twice daily"] = "Zweimal Täglich";
 $a->strings["Daily"] = "Täglich";
-$a->strings["Weekly"] = "Wöchendlich";
+$a->strings["Weekly"] = "Wöchentlich";
 $a->strings["Monthly"] = "Monatlich";
 $a->strings["Male"] = "Männlich";
 $a->strings["Female"] = "Weiblich";
-$a->strings["Currently Male"] = "Momentan Männlich";
+$a->strings["Currently Male"] = "Momentan männlich";
-$a->strings["Currently Female"] = "Momentan Weiblich";
+$a->strings["Currently Female"] = "Momentan weiblich";
-$a->strings["Mostly Male"] = "Hauptsächlich Männlich";
+$a->strings["Mostly Male"] = "Hauptsächlich männlich";
-$a->strings["Mostly Female"] = "Hauptsächlich Weiblich";
+$a->strings["Mostly Female"] = "Hauptsächlich weiblich";
 $a->strings["Transgender"] = "Transgender";
 $a->strings["Intersex"] = "Intersex";
-$a->strings["Transsexual"] = "Transsexuel";
+$a->strings["Transsexual"] = "Transsexuell";
 $a->strings["Hermaphrodite"] = "Hermaphrodit";
 $a->strings["Neuter"] = "Neuter";
 $a->strings["Non-specific"] = "Nicht spezifiziert";
@@ -861,7 +861,7 @@ $a->strings["Females"] = "Frauen";
 $a->strings["Gay"] = "Schwul";
 $a->strings["Lesbian"] = "Lesbisch";
 $a->strings["No Preference"] = "Keine Vorlieben";
-$a->strings["Bisexual"] = "Bisexuel";
+$a->strings["Bisexual"] = "Bisexuell";
 $a->strings["Autosexual"] = "Autosexual";
 $a->strings["Abstinent"] = "Abstinent";
 $a->strings["Virgin"] = "Jungfrau";
@@ -875,9 +875,9 @@ $a->strings["Available"] = "Verfügbar";
 $a->strings["Unavailable"] = "Nicht verfügbar";
 $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
-$a->strings["Sex Addict"] = "Sex Besessen";
+$a->strings["Sex Addict"] = "Sexbesessen";
 $a->strings["Friends"] = "Freunde";
-$a->strings["Friends/Benefits"] = "Friends/Benefits";
+$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
 $a->strings["Married"] = "Verheiratet";
@@ -937,7 +937,7 @@ $a->strings["End this session"] = "Diese Sitzung beenden";
 $a->strings["Login"] = "Anmeldung";
 $a->strings["Sign in"] = "Anmelden";
 $a->strings["Home"] = "Persönlich";
-$a->strings["Home Page"] = "Home Page";
+$a->strings["Home Page"] = "Homepage";
 $a->strings["Create an account"] = "Account erstellen";
 $a->strings["Help and documentation"] = "Hilfe und Dokumentation";
 $a->strings["Apps"] = "Apps";

view/directory_header.tpl

@@ -8,7 +8,7 @@ $finding
 <div id="directory-search-wrapper">
 <form id="directory-search-form" action="directory" method="get" >
 <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="$submit" />
+<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
 </form>
 </div>
 <div id="directory-search-end"></div>

view/directory_item.tpl

@@ -1,5 +1,5 @@
 
-<div class="directory-item" id="directory-item-$id" >
+<div class="directory-item lframe" 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>

view/group_drop.tpl

@@ -1,7 +1,6 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
 	<a href="group/drop/$id" 
 		onclick="return confirmDelete();" 
-		title="$delete" 
 		id="group-delete-icon-$id" 
 		class="icon drophide group-delete-icon" 
 		onmouseover="imgbright(this);" 

view/like_noshare.tpl

@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>

view/login.tpl

@@ -11,7 +11,7 @@
         <input type="password" maxlength="60" name="password" id="login-password" value="" />
 </div>
 <div id="login-password-end"></div>
-<div id="login-extra-links">
+<div id="login-extra-links" class=".button">
 	<div id="login-extra-filler">&nbsp;</div>
 	$register_html
         <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>

view/mail_conv.tpl

@@ -1,15 +1,14 @@
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
-		<a href="$from_url" class="mail-conv-sender-url" ><img class="mail-conv-sender-photo$sparkle" src="$from_photo" alt="$from_name" /></a>
+		<a href="$from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$sparkle" src="$from_photo" alt="$from_name" /></a>
 	</div>
 	<div class="mail-conv-detail" >
 		<div class="mail-conv-sender-name" >$from_name</div>
 		<div class="mail-conv-date">$date</div>
 		<div class="mail-conv-subject">$subject</div>
 		<div class="mail-conv-body">$body</div>
-	</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
 </div>
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-
-<div class="mail-conv-outside-wrapper-end"></div>
 <hr class="mail-conv-break" />

view/mail_head.tpl

@@ -2,8 +2,8 @@
 
 <div class="message-links">
 <ul>
-<li><a href="message" class="message-link-inbox">$inbox</a></li>
+<li><a href="message" class="button message-link-inbox">$inbox</a></li>
-<li><a href="message/sent" class="message-link-outbox">$outbox</a></li>
+<li><a href="message/sent" class="button message-link-outbox">$outbox</a></li>
-<li><a href="message/new" class="message-link-new">$new</a></li>
+<li><a href="message/new" class="button message-link-new">$new</a></li>
 <ul>
 </div>

view/mail_list.tpl

@@ -6,10 +6,10 @@
 		<div class="mail-list-sender-name" >$from_name</div>
 		<div class="mail-list-date">$date</div>
 		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-		delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
 	</div>
 </div>
-<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
 </div>
 <div class="mail-list-delete-end"></div>
 

view/photo_album.tpl

@@ -1,6 +1,6 @@
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
 	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" />
+		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
 		<p class='caption'>$desc</p>		
 	</a>
 	

view/photo_edit.tpl

@@ -19,7 +19,7 @@
 	<div id="photo-edit-tags-end"></div>
 
 	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" title="$permissions"/>
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>
 			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
 		<div id="photo-edit-perms-menu-end"></div>

view/photo_top.tpl

@@ -1,5 +1,5 @@
 
-<div class="photo-top-image-wrapper" id="photo-top-image-wrapper-$id">
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
 	<a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
 	<div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
 </div>

view/photos_upload.tpl

@@ -15,7 +15,7 @@
 
 
 	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" />
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
 		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
 	<div id="photos-upload-perms-end"></div>

view/profile_listing_header.tpl

@@ -1,8 +1,8 @@
 <h1>$header</h1>
-<p id="profile-listing-desc" >
+<p id="profile-listing-desc" class="button" >
 <a href="profile_photo" >$chg_photo</a>
 </p>
-<div id="profile-listing-new-link-wrapper" >
+<div id="profile-listing-new-link-wrapper" class="button >
 <a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
 </div>
 

view/profile_tabs.tpl

@@ -1,9 +1,9 @@
 
 <div id="profile-tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
+	<a href="$url" id="profile-tab-status-link" class="profile-tabs button" >$status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs button" >$profile</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs button" >$photos</a>
-	{{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs" >$events</a>{{ endif }}
+	{{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs button" >$events</a>{{ endif }}
-	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >$notes</a>{{ endif }}
+	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs button" >$notes</a>{{ endif }}
 <div id="profile-tabs-end"></div>
 </div>

view/prv_message.tpl

@@ -15,7 +15,7 @@ $select
 <div id="prvmail-message-label">$yourmessage</div>
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
 
-</div>
+
 <div id="prvmail-submit-wrapper" >
 	<input type="submit" id="prvmail-submit" name="submit" value="Submit" />
 	<div id="prvmail-upload-wrapper" >
@@ -29,5 +29,6 @@ $select
 	</div> 
 </div>
 <div id="prvmail-end"></div>
+</div>
 </form>
 </div>

view/settings_tabs.tpl

@@ -1,6 +1,6 @@
 
 <div id="profile-tabs-wrapper" >
-	<a href="$account.1" id="profile-tab-status-link" class="profile-tabs" >$account.0</a>
+	<a href="$account.1" id="profile-tab-status-link" class="profile-tabs button" >$account.0</a>
-	<a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs" >$plugins.0</a>
+	<a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs button" >$plugins.0</a>
 <div id="profile-tabs-end"></div>
 </div>

view/suggestions.tpl

@@ -4,7 +4,7 @@
 <p class="intro-desc">$str_notifytype $notify_type</p>
 <div class="intro-madeby">$madeby</div>
 <div class="intro-fullname" >$fullname</div>
-<a class="intro-url-link" href="$url" ><img class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
 <div class="intro-note" >$note</div>
 <div class="intro-wrapper-end"></div>
 <form class="intro-form" action="notifications/$intro_id" method="post">

view/theme/darkbubble/contact_edit.tpl

@@ -0,0 +1,67 @@
+
+<h2>$header</h2>
+
+<div id="contact-edit-banner-name">$name</div>
+
+$nettype
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+<div id="contact-edit-wrapper" >
+
+	<div id="contact-edit-photo-wrapper" >
+		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
+		<div id="contact-edit-photo" >
+			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
+		</div>
+		<div id="contact-edit-photo-end" ></div>
+	</div>
+	<div id="contact-edit-nav-wrapper" >
+
+		<div id="contact-edit-links" >
+			<a href="contacts/$contact_id/block" class="icon block" id="contact-edit-block-link" title="$block_text"></a>
+			<a href="contacts/$contact_id/ignore" class="icon no" id="contact-edit-ignore-link" title="$ignore_text"></a>
+			<a href="crepair/$contact_id" class="icon tools" id="contact-edit-repair" title="$lblcrepair"></a>
+			<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+		</div>
+		<div id="contact-edit-nav-end"></div>
+
+		{{ if $poll_enabled }}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
+			<div id="contact-edit-poll-text">$updpub</div>
+			$poll_interval
+			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
+		</div>
+		{{ endif }}
+	</div>
+	<div id="contact-edit-end" ></div>
+
+$insecure
+$blocked
+$ignored
+
+<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
+$lblsuggest
+
+<div id="contact-edit-info-wrapper">
+<h4>$lbl_info1</h4>
+<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
+</div>
+<div id="contact-edit-info-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+<div id="contact-edit-profile-select-text">
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2
+</p> 
+</div>
+$profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+</form>
+</div>

view/theme/darkbubble/group_drop.tpl

@@ -0,0 +1,8 @@
+<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
+	<a href="group/drop/$id" 
+		onclick="return confirmDelete();" 
+		title="$delete" 
+		id="group-delete-icon-$id" 
+		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
+</div>
+<div class="group-delete-end"></div>

view/theme/darkbubble/group_edit.tpl

@@ -0,0 +1,16 @@
+<h2>$title</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/$gid" id="group-edit-form" method="post" >
+		<div id="group-edit-name-wrapper" >
+			<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
+			<input type="text" id="group-edit-name" name="groupname" value="$name" />
+			<input type="submit" name="submit" value="$submit">
+			$drop
+		</div>
+		<div id="group-edit-name-end"></div>
+		<div id="group-edit-desc">$desc</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>

view/theme/darkbubble/jot-header.tpl

@@ -0,0 +1,251 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var editor=false;
+var textlen = 0;
+
+function initEditor(cb) {
+    if (editor==false) {
+        $("#profile-jot-text-loading").show();
+        tinyMCE.init({
+                theme : "advanced",
+                mode : "specific_textareas",
+                editor_selector: /(profile-jot-text|prvmail-text)/,
+                plugins : "bbcode,paste,fullscreen,autoresize",
+                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "center",
+                theme_advanced_blockformats : "blockquote,code",
+                //theme_advanced_resizing : true,
+                //theme_advanced_statusbar_location : "bottom",
+                paste_text_sticky : true,
+                entity_encoding : "raw",
+                add_unload_trigger : false,
+                remove_linebreaks : false,
+                force_p_newlines : false,
+                force_br_newlines : true,
+                forced_root_block : '',
+                convert_urls: false,
+                content_css: "$baseurl/view/custom_tinymce.css",
+                theme_advanced_path : false,
+                setup : function(ed) {
+                     //Character count
+                        ed.onKeyUp.add(function(ed, e) {
+                                var txt = tinyMCE.activeEditor.getContent();
+                                textlen = txt.length;
+                                if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+                                        $('#profile-jot-desc').html(ispublic);
+                                }
+                                else {
+                                        $('#profile-jot-desc').html('&nbsp;');
+                                }
+
+                                if(textlen <= 140) {
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('grey');
+                                }
+                                if((textlen > 140) && (textlen <= 420)) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').addClass('orange');
+                                }
+                                if(textlen > 420) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('red');
+                                }
+                                $('#character-counter').text(textlen);
+                        });
+                        ed.onInit.add(function(ed) {
+                                ed.pasteAsPlainText = true;
+                                $("#profile-jot-text-loading").hide();
+                                $("#profile-jot-submit-wrapper").show();
+                                $("#profile-upload-wrapper").show();
+                                $("#profile-attach-wrapper").show();
+                                $("#profile-link-wrapper").show();
+                                $("#profile-youtube-wrapper").show();
+                                $("#profile-video-wrapper").show();
+                                $("#profile-audio-wrapper").show();
+                                $("#profile-location-wrapper").show();
+                                $("#profile-nolocation-wrapper").show();
+                                $("#profile-title-wrapper").show();
+                                $("#profile-jot-plugin-wrapper").show();
+                                $("#character-counter").show();
+                                if (typeof cb!="undefined") cb();
+                        });
+                }
+        });
+        editor = true;
+        // setup acl popup
+        $("a#jot-perms-icon").fancybox({
+            'transitionIn' : 'none',
+            'transitionOut' : 'none'
+        }); 
+    } else {
+        if (typeof cb!="undefined") cb();
+    }
+} // initEditor
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+    var ispublic = '$ispublic';
+	$(document).ready(function() {
+                /* enable tinymce on focus */
+                $("#profile-jot-text").focus(function(){
+                    if (editor) return;
+                    $(this).val("");
+                    initEditor();
+                }); 
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);		
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotGetVideo() {
+		reply = prompt("$utubeurl");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("$vidurl");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("$audurl");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("$whereareu", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotTitle() {
+		reply = prompt("$title", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					tinyMCE.execCommand('mceInsertRawHTML',false,data);
+					$('#like-rotator-' + id).hide();
+					$(window).scrollTop(0);
+				});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					tinyMCE.execCommand('mceInsertRawHTML',false,data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	$geotag
+
+</script>
+

view/theme/darkbubble/jot.tpl

@@ -0,0 +1,75 @@
+
+<div id="profile-jot-wrapper" > 
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey" style="display: none;">0</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>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="wall" />
+		<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="title" id="jot-title" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+
+                <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>
+                {{ if $content }}<script>initEditor();</script>{{ endif }}
+
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
+	</div>  
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-youtube" class="icon border  youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
+	</div> 
+	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
+	</div> 
+
+	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
+		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
+            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper" style="display: none;">
+  	$jotplugins
+	</div>
+	<div id="profile-jot-tools-end"></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>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>

view/theme/darkbubble/login.tpl

@@ -0,0 +1,25 @@
+
+<form action="" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+	<div id="login-name-wrapper">
+	        <label for="login-name" id="label-login-name">$namelabel</label>
+	        <input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
+	</div>
+	<div id="login-name-end" ></div>
+	<div id="login-password-wrapper">
+	        <label for="login-password" id="label-login-password">$passlabel</label>
+	        <input type="password" maxlength="60" name="password" id="login-password" value="" />
+	</div>
+	<div id="login-password-end"></div>
+	<div id="login-submit-wrapper" >
+	        <input type="submit" name="submit" id="login-submit-button" value="$login" />
+			<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>
+	<div id="login-submit-end"></div>
+	<div id="login-extra-links">
+		<div id="login-extra-filler">&nbsp;</div>
+		$register_html
+	</div>
+	<div id="login-extra-end"></div>
+</form>
+

view/theme/darkbubble/mail_head.tpl

@@ -0,0 +1,7 @@
+<h3>$messages</h3>
+
+<ul class="tabs-wrapper">
+<li><a href="message" class="tabs">$inbox</a></li>
+<li><a href="message/sent" class="tabs">$outbox</a></li>
+<li><a href="message/new" class="tabs">$new</a></li>
+</ul>

view/theme/darkbubble/nav.tpl

@@ -0,0 +1,55 @@
+<nav>
+	$langselector
+
+	<span id="banner">$banner</span>
+
+	<div id="notifications">
+		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
+		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
+		{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
+		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+	</div>
+
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+		
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
+			
+			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
+		
+			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
+		
+				{{ if $nav.community }}
+				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+				{{ endif }}
+
+			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>{{ endif }}
+			
+			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
+			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
+			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
+		
+			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
+			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
+			
+			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
+		
+			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
+			
+			<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
+
+			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
+			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
+		</ul>
+	</div>
+
+
+
+</nav>
+

view/theme/darkbubble/photo_view.tpl

@@ -0,0 +1,40 @@
+<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" 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 }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+	$likebuttons
+	$like
+	$dislike	
+</div>
+{{ endif }}
+
+$comments
+
+$paginate
+

view/theme/darkbubble/profile_entry.tpl

@@ -0,0 +1,11 @@
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
+</div>
+<div class="profile-listing-photo-end"></div>
+<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
+<div class='profile-visible'>$visible</div>
+</div>
+<div class="profile-listing-end"></div>
+

view/theme/darkbubble/profile_tabs.tpl

@@ -0,0 +1,9 @@
+
+<div class="tabs-wrapper" >
+	<a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
+	{{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
+	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}	
+<div class="tabs-end"></div>
+</div>

view/theme/darkbubble/profile_vcard.tpl

@@ -0,0 +1,45 @@
+<div class="vcard">
+	<div class="fn label">$profile.name</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" alt="$profile.name"></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<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/darkbubble/search_item.tpl

@@ -0,0 +1,48 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+		<div class="wall-item-info" id="wall-item-info-$id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
+				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+					<ul>
+						$item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$id" >
+			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-conv" id="wall-item-conv-$id" >
+	{{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>

view/theme/darkbubble/style.css

@@ -0,0 +1,7 @@
+@import url('../testbubble/style.css');
+
+body {
+	background: #000000;
+	color: #dddddd;
+}
+

view/theme/darkbubble/wall_item.tpl

@@ -0,0 +1,75 @@
+<!-- test -->
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+		<div class="wall-item-info" id="wall-item-info-$id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
+				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+				</a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+					<ul>
+						$item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$id" >
+			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+		</div>
+
+		<div class="wall-item-tools" id="wall-item-tools-$id">
+			{{ if $vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $plink }}
+				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ endif }}
+			 
+			{{ if $star }}
+			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			{{ endif }}
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+
+			
+		</div>
+		
+		<div class="wall-item-author">
+				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				
+		</div>	
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-comment-wrapper" >
+	$comment
+	</div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+

view/theme/darkbubble/wallwall_item.tpl

@@ -0,0 +1,74 @@
+<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
+	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
+				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
+				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+                    <ul>
+                        $item_photo_menu
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>				
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$id">
+			{{ if $vote }}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
+				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+			</div>
+			{{ endif }}
+			{{ if $plink }}
+				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
+			{{ if $edpost }}
+				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
+			{{ endif }}
+			 
+			{{ if $star }}
+			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			{{ endif }}
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$id" >
+			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+		</div>
+		<div class="wall-item-author">
+			<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+		</div>	
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-comment-wrapper" >
+	$comment
+	</div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+

view/theme/duepuntozero/nav.tpl

@@ -8,7 +8,7 @@
 
 	<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 }}
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" 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>
 		
@@ -20,26 +20,26 @@
 	{{ 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.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{ endif }}
 	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
 	<span id="home-update" class="nav-ajax-left"></span>
 	{{ endif }}
 	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.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>
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2 $sel.notifications" 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>
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0 $sel.messages" 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.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" 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 }}

view/theme/duepuntozero/style.css

@@ -146,7 +146,7 @@ nav .nav-link {
 }
 
 
-.nav-selected {
+.nav-commlink.selected {
 	background-color: #ffffff;
 	border-bottom: 1px solid #ffffff;
 	color: #000000 !important;
@@ -509,6 +509,7 @@ input#dfrn-url {
 
 #profile-extra-links {
 	clear: both;
+	margin-top: 10px;
 }
 
 #profile-extra-links ul {

view/theme/testbubble/contact_edit.tpl

@@ -12,7 +12,7 @@ $nettype
 
 	<div id="contact-edit-photo-wrapper" >
 		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
+		<div id="contact-edit-photo" class="lframe">
 			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
 		</div>
 		<div id="contact-edit-photo-end" ></div>
@@ -32,7 +32,7 @@ $nettype
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
 			<div id="contact-edit-poll-text">$updpub</div>
 			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
+			<div id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></div>
 		</div>
 		{{ endif }}
 	</div>
@@ -42,7 +42,7 @@ $insecure
 $blocked
 $ignored
 
-<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
+<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent" class="button">$lblrecent</a></div>
 $lblsuggest
 
 <div id="contact-edit-info-wrapper">

view/theme/testbubble/jot-header.tpl

@@ -90,7 +90,7 @@ function initEditor(cb) {
     }
 } // initEditor
 </script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
     var ispublic = '$ispublic';
 	$(document).ready(function() {

view/theme/testbubble/login.tpl

@@ -16,7 +16,7 @@
 			<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
 	</div>
 	<div id="login-submit-end"></div>
-	<div id="login-extra-links">
+	<div id="login-extra-links" class=".button">
 		<div id="login-extra-filler">&nbsp;</div>
 		$register_html
 	</div>

view/theme/testbubble/mail_head.tpl

@@ -1,7 +1,7 @@
 <h3>$messages</h3>
 
 <ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
+<li><a href="message" class="tabs button">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
+<li><a href="message/sent" class="tabs button">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
+<li><a href="message/new" class="tabs button">$new</a></li>
 </ul>

view/theme/testbubble/nav.tpl

@@ -17,18 +17,19 @@
 			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
 			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
 
-			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
+			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
 			
 			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
 		
 			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
 		
 				{{ if $nav.community }}
-				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
 				{{ endif }}
 
-			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
-			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
+			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
 			
 			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
 			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
@@ -41,15 +42,14 @@
 		
 			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
 			
-			<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
+			<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>
 
-			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
+			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
 			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
 		</ul>
 	</div>
 
 
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
 
 </nav>
 

view/theme/testbubble/photo_view.tpl

@@ -10,7 +10,7 @@
 {{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
 </div>
 
-<div id="photo-photo">
+<div id="photo-photo" class="lframe">
 	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
 	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
 	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}

view/theme/testbubble/profile_entry.tpl

@@ -1,7 +1,7 @@
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
 </div>
 <div class="profile-listing-photo-end"></div>
 <div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>

view/theme/testbubble/profile_tabs.tpl

@@ -1,9 +1,9 @@
 
 <div class="tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
+	<a href="$url" id="profile-tab-status-link" class="button tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="button tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="button tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
-	{{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
+	{{ if $events }}<a href="events" id="profile-tab-events-link" class="button tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
-	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}	
+	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="button tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}	
 <div class="tabs-end"></div>
 </div>

view/theme/testbubble/search_item.tpl

@@ -1,7 +1,7 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id" 
 				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
 				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">

view/theme/testbubble/style.css

@@ -7,14 +7,11 @@
 */
 /* ========== */
 /* = Colors
-
 Red links - #b20202
 Red link hover - #db0503
 Red Gradients (buttons and other gradients) - #b20202 and #d60808
-
 Grey/body text - #626262
 Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
-
 Dark Grey Gradients - #7c7d7b and #555753
 
 You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
@@ -22,17 +19,6 @@ You can switch out the colors of the header, buttons and links by using a find a
  = */
 /* ========== */
 
-/*html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-weight: inherit;
-	font-style: inherit;
-	font-size: 100%;
-	font-family: inherit;
-	vertical-align: baseline;
-}*/
-
 body {
 	margin: 0px;
 	padding: 0px;
@@ -133,10 +119,63 @@ section {
 	padding-right: 230px;
 }
 
+.lframe {
+	border: 1px solid #dddddd;
+	-moz-box-shadow: 3px 3px 6px #959494;
+	-webkit-box-shadow: 3px 3px 6px #959494;
+	box-shadow: 3px 3px 6px #959494;
+	background-color: #efefef;
+	padding: 10px;	
+}
+
+.mframe {
+	padding: 5px;
+	background-color: #efefef;
+	border: 2px solid #dddddd;
+	-moz-box-shadow: 3px 3px 4px #959494;
+	-webkit-box-shadow: 3px 3px 4px #959494;
+	box-shadow: 3px 3px 4px #959494;
+}
+
 #wall-item-lock {
 	margin-left: 10px;
 }
 
+.button {
+	border: none;
+	font-size: 1em;
+	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color:#bdbdbd;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+	color:#efefef;
+	text-align: center;	
+}
+
+.button:hover {
+	border: none;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+	background-color:#b20202;
+	color: #efefef;	
+}
+
+.button:active {
+	position:relative;
+	top:1px;
+}
+
+.button a {
+	color: #efefef;
+}
+
 /* ========= */
 /* = Login = */
 /* ========= */
@@ -159,45 +198,16 @@ section {
 #login-extra-links {
 	width: 90px;
 	margin-top: 20px;
-	border: none;
-	font-size: 0.9em;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	color:#efefef;
-	text-align: center;
 }
 
 #login-extra-links a {
 	display: block;
 	margin: 10px;
 	padding: 5px 0px 5px 0px;
-	color: #efefef;
 	text-align: center;
 	margin-right: 20px;	
 }
 
-#login-extra-links:hover {
-	border: none;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-	color: #efefef;	
-}
-
-#login-extra-links:active {
-	position:relative;
-	top:1px;	
-}
-
 #login-extra-filler {
 	display: none;
 }
@@ -283,13 +293,14 @@ nav #user-menu {
 	padding: 5px;
     position: relative;
     vertical-align: middle;
-	background:-webk/*	margin-right:10px;*/it-gradient( linear, left top, left bottom, color-stop(0.05, #898988), color-stop(1, #a2a2a2) );
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
-	background:-moz-linear-gradient( center top, #898988 5%, #a2a2a2 100% );
+	background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#898988', endColorstr='#a2a2a2');
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
 	background-color:#a2a2a2;
 	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
 	border-radius:5px;
+	border: 1px solid #9A9A9A;
 	color:#efefef;
 	text-decoration:none;
 	text-align: center;   
@@ -317,7 +328,7 @@ ul#user-menu-popup {
     width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	margin-top: 10px;
+	margin-top: 4px;
     top: 20px;
 	left: 0px;
 	border: 1px solid #9a9a9a;
@@ -422,8 +433,6 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 aside {
     position: absolute;
     right: 11%;
-/*	float: right;
-	margin-right: 11%;*/
 	width: 260px;
 	margin-top: auto;
     font-size: 0.8em;
@@ -440,14 +449,10 @@ aside a{
 	font-variant:small-caps;
 }
 
-.marital {
+.vcard dd {
-	font-size: 1em;
+	font-size: 12px;
-	font-variant:small-caps;	
+	font-variant: normal;
-}
+	-webkit-margin-start: 10px;
-
-.homepage-label {
-	font-size: 1em;
-	font-variant:small-caps;	
 }
 
 .vcard .fn {
@@ -478,7 +483,7 @@ aside #viewcontacts {
 	padding-top: 5px;
 }
 
-#viewcontacts a{
+#viewcontacts a {
 	color: #898989;
 }
 
@@ -526,7 +531,6 @@ aside #viewcontacts {
 
 #netsearch-box {
 	background-color: #f6f6f6;
-	/*padding: 10px 10px 10px 20px;*/
 	padding: 10px 8px 10px 8px;
 }
 #netsearch-box input[type="text"] {
@@ -747,7 +751,6 @@ ul .sidebar-group-li img{
 }
 
 #character-counter {
-	/*float: left; padding: 8px 10px;*/ 
 	position: absolute: right: 100px; top:100px;
 }
 #profile-rotator-wrapper {
@@ -827,36 +830,10 @@ profile-jot-banner-wrapper {
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	font-style: bold;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	color:#efefef;
-	text-decoration:none;
-	text-align: center;
 }
 
 .tabs:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-	color:#efefef;
 	padding: 5px 10px 5px 10px;
-	margin-right: 5px;
-}
-.tabs:active {
-	position:relative;
-	top:1px;
-	color:#efefef;
-	padding: 5px 10px 5px 10px;
-	margin-right: 5px;
 }
 
 /* ========= */
@@ -886,12 +863,6 @@ profile-jot-banner-wrapper {
 .wall-item-photo-wrapper { 
 	width: 80px; height: 80px;  
 	position: relative;
-	padding: 5px;
-	background-color: #eeeeee;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;
 }
 
 .wall-item-tools { 
@@ -1072,7 +1043,7 @@ profile-jot-banner-wrapper {
 .icon.drophide { float: left; }
 #item-delete-selected {	overflow: auto;	width: 100%;}
 .wall-item-outside-wrapper {
-	max-width: 90%;
+	max-width: 83%;
 	border-bottom: 1px solid #dedede;
 	margin-top: 20px;
 }
@@ -1089,7 +1060,11 @@ profile-jot-banner-wrapper {
 }
  
 .wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
+.wall-item-outside-wrapper.comment .wall-item-photo {
+	width: 40px!important;
+	height: 40px!important;
+}
+
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
 	width: 50px;
@@ -1157,9 +1132,6 @@ profile-jot-banner-wrapper {
 	color: #898989;
 }
 
-/**
- * item text style
- **/
 .wall-item-body code {
     border-color: #CCCCCC;
     border-style: solid;
@@ -1198,78 +1170,22 @@ div[id$="wrapper"] br { clear: left; }
 	width: 150px;
 	margin-bottom:20px;
 	margin-top: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
 	display:inline-block;
-	color:#efefef;
 	font-style: bold;
 	text-align: center;
 }
 
-#profile-listing-desc:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#profile-listing-desc:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#profile-listing-desc a {
-	color: #efefef;
-}
-
 #profile-listing-new-link-wrapper {
 	float: left;
 	display: inline;
 	width: 130px;
 	margin-left:5px;
 	margin-top: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	font-style: bold;
-	color:#efefef;
 	text-align: center;
 }
 
-#profile-listing-new-link-wrapper:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#profile-listing-new-link-wrapper:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#profile-listing-new-link-wrapper a {
-	color: #efefef;
-}
-
 .profile-listing-name {
 	font-size: 1em;
 	font-variant: small-caps;
@@ -1278,52 +1194,6 @@ div[id$="wrapper"] br { clear: left; }
 	color: #898989;
 }
 
-.profile-listing-visible {
-	width: 90px;
-	margin-bottom:20px;
-	margin-top: 10px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	padding: 5px 10px 5px 10px;
-	margin-right: 5px;
-	color:#efefef;
-	text-align: center;
-}
-
-.profile-listing-visible:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-.profile-listing-visible:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-.profile-listing-visible  a {
-	color: #efefef;
-}
-
-.profile-listing-photo {
-	padding: 5px;
-	background-color: #efefef;
-	border: 2px dotted #eeeeee;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;	
-}
-
 #profile-edit-links li {
 	display: inline;
 	width: 150px;
@@ -1413,12 +1283,6 @@ div[id$="wrapper"] br { clear: left; }
 .photo-top-image-wrapper { 
 	float: left; 
 	margin: 0px 10px 10px 0px;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 6px #959494;
-	-webkit-box-shadow: 3px 3px 6px #959494;
-	box-shadow: 3px 3px 6px #959494;
-	background-color: #efefef;
-	padding: 10px;
 	padding-bottom: 30px;
 	position:relative;	
 }
@@ -1433,7 +1297,11 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 .photo-top-photo,
-.photo-album-photo {} 
+.photo-album-photo {
+	width: 180px;
+	height: 180px;
+	overflow: hidden;
+}
 
 .photo-top-album-name {
 	position: absolute;
@@ -1461,12 +1329,6 @@ div[id$="wrapper"] br { clear: left; }
 #photo-photo{
 	position: relative;
 	float:left;	
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 6px #959494;
-	-webkit-box-shadow: 3px 3px 6px #959494;
-	box-shadow: 3px 3px 6px #959494;
-	background-color: #efefef;
-	padding: 10px;	
 }
 
 #photo-caption {
@@ -1533,54 +1395,14 @@ div[id$="wrapper"] br { clear: left; }
 
 #photos-upload-perms-menu {
 	width: 180px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
 	padding: 7px;
-	text-align: center;
-	font-size: 0.9em;
-	color: #efefef;
-}
-
-#photos-upload-perms-menu:hover {
-	text-align: center;
-	font-size: 0.9em;
-	width: 180px;
-	padding: 7px;
-	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#photos-upload-perms-menu:active {
-	text-align: center;
-	font-size: 0.9em;
-	width: 180px;
-	padding: 7px;
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#photos-upload-perms-menu  a {
-	color: #efefef;
 }
 
 #photos-upload-perms-menu .icon {
 	display: none;
 }
 
-select[size], select[multiple], select[size][multiple] {
+select, input {
-	-webkit-appearance: listbox;	
 	border: 2px solid #b0b0b0;
 	padding: 2px;
     -webkit-border-radius: 3px 3px 3px 3px;
@@ -1588,16 +1410,15 @@ select[size], select[multiple], select[size][multiple] {
     border-radius: 3px 3px 3px 3px;	
 }
 
+select[size], select[multiple], select[size][multiple] {
+	-webkit-appearance: listbox;
+}
+
 select {
 	-webkit-appearance: menulist;
 	box-sizing: border-box;
 	-webkit-box-align: center;
 	cursor: default;	
-	border: 2px solid #b0b0b0;
-	padding: 2px;
-    -webkit-border-radius: 3px 3px 3px 3px;
-    -moz-border-radius: 3px 3px 3px 3px;
-    border-radius: 3px 3px 3px 3px;
 }
 
 keygen, select {
@@ -1614,57 +1435,12 @@ input, textarea, keygen {
 	text-shadow: none;
 	display: inline-block;
 	text-align: -webkit-auto;	
-	border: 2px solid #b0b0b0;
-	padding: 2px;
-    -webkit-border-radius: 3px 3px 3px 3px;
-    -moz-border-radius: 3px 3px 3px 3px;
-    border-radius: 3px 3px 3px 3px;
 }
 
 .qq-upload-button {
-	background-color: none;
-	-moz-box-shadow:inset 0px 1px 0px 0px #a65151;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #a65151;
-	box-shadow:inset 0px 1px 0px 0px #a65151;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #d60808), color-stop(1, #b20202) );
-	background:-moz-linear-gradient( center top, #d60808 5%, #b20202 100%);
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d60808', endColorstr='#b20202');
-	background-color:#d60808;
 	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
 	border-radius:5px;
-	border:1px solid #fc5656;
-	display:inline-block;
-	color:#f0e7e7;
-	text-shadow:1px 1px 0px #b36f6f;
-	text-align: center;
-	font-size: 0.9em;
-	color: #efefef;
-	width: 91px;
-	padding: 7px;
-}
-
-.qq-upload-button:hover {
-	text-align: center;
-	font-size: 0.9em;
-	color: #efefef;
-	width: 91px;
-	padding: 7px;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) )!important;
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% )!important;
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808')!important;
-	background-color:#b20202;
-}
-
-.qq-upload-button:active {
-	text-align: center;
-	font-size: 0.9em;
-	color: #efefef;
-	background-color: #B20202;
-	width: 91px;
-	padding: 7px;
-	position:relative;
-	top:1px;
 }
 
 #album-edit-link {
@@ -1709,41 +1485,10 @@ input#photo_edit_form {
 	display: inline;
 	margin-top: 10px;
 	margin-right: 10px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
 	padding: 4px;
-	color: #efefef;
-	text-align: center;
-	font-size: 0.9em;
 	width: 100px;
 }
 
-#photo-edit-perms-menu:hover {
-	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#photo-edit-perms-menu:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#photo-edit-perms-menu a {
-	color: #efefef;
-}
-
 #photo-edit-perms-menu .icon {
 	display: none;
 }
@@ -1839,16 +1584,15 @@ input#photo_edit_form {
 	font-size: 1em;	
 }
 
-
 #prvmail-submit-wrapper { margin-top: 10px; }
 #prvmail-submit {
 	float: right;
 	margin-top: 0px;
-	margin-right: 90px;
+	margin-right: 0px;
 }
 
 #prvmail-upload {
-margin-left: 90px;	
+margin-left: 0px;	
 }
 
 #prvmail-submit-wrapper > div {
@@ -1889,7 +1633,7 @@ margin-left: 90px;
 	float: right;
 	clear: block;
 	display: inline;
-	font-size: 0.8em;
+	font-size: 0.9em;
 	padding-left: 10px;
 	font-stretch:ultra-condensed;
 	font-variant:small-caps;
@@ -1906,21 +1650,19 @@ margin-left: 90px;
 	color: #626262;
 }
 
-.mail-list-delete-wrapper { float: left; margin-right:550px; }
+.mail-list-delete-wrapper { float: right;}
 .mail-list-outside-wrapper-end {
 	clear: both;
 }
 
+.mail-conv-outside-wrapper {
+	margin-bottom: 10px;
+}
+
 .mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
 .mail-conv-sender-photo {
 	width: 64px;
 	height: 64px;
-	padding: 5px;
-	background-color: #efefef;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;
 }
 
 .mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
@@ -1933,19 +1675,26 @@ margin-left: 90px;
 .mail-conv-detail {
 	width: 500px;
 	padding: 30px;
+	padding-bottom: 10px;
 	margin-left: 20px;
+	margin-bottom: 0px;
 	vertical-align: middle;
 	margin: auto;
 	border: 1px solid #dddddd;
 }
 .mail-conv-break { display: none; border: none;}
-.mail-conv-delete-wrapper { margin-top: 5px; width: 650px; text-align: right; }
+.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
+
+#prvmail-subject {
+	font-weight: bold;
+	border: none;
+}
 
 /* ================= */
 /* = Notifications = */
 /* ================= */
 
-#notification-show-hide-wrapper {
+/*#notification-show-hide-wrapper {
 	width: 160px;
 	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
@@ -1981,7 +1730,7 @@ margin-left: 90px;
 
 #notification-show-hide-wrapper a {
 	color: #efefef;
-}
+}*/
 
 /* ============ */
 /* = Contacts = */
@@ -2004,14 +1753,6 @@ margin-left: 90px;
 .contact-entry-direction-wrapper {position: absolute; top: 20px;}
 .contact-entry-edit-links { position: absolute; top: 60px; }
 #contacts-show-hide-link { margin-bottom: 20px; margin-top: 10px; font-weight: bold;}
-.contact-entry-photo {
-	padding: 3px;
-	background-color: #eeeeee;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;
-}
 
 .contact-entry-name {
 	width: 100px;
@@ -2041,7 +1782,6 @@ margin-left: 90px;
 #contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
 #contact-edit-nav-wrapper { margin-left: 210px; }
 #contact-edit-links { float: left; margin-top: 23px; }
-#contact-drop-links {/*position: absolute; top: 150px; left: 348px;*/}
 #contact-edit-nav-wrapper .icon {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
@@ -2065,21 +1805,10 @@ margin-left: 90px;
 
 #contact-edit-update-now {
 	width: 80px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	margin-left: 125px;
 	margin-top: 10px;
 	font-style: bold;
-	color: #efefef;
 }
 
 #contact-edit-update-now:hover {
@@ -2119,15 +1848,6 @@ margin-left: 90px;
     display: none;      
 }
 
-#contact-edit-photo {
-	padding: 10px;
-	background-color: #f1f1f1;
-	border: 1px solid #dedede;
-	margin-bottom: 5px;
-	-moz-box-shadow: 5px 5px 8px #959494;
-	-webkit-box-shadow: 5px 5px 8px #959494;
-	box-shadow: 5px 5px 8px #959494;	
-}
 .contact-photo-menu {
     width: auto;
     border: 1px solid #ddd;
@@ -2152,15 +1872,6 @@ margin-left: 90px;
 	text-decoration: none;
 }
 
-.view-contact-photo {
-	padding: 5px;
-	background-color: #efefef;
-	border: 1px solid #dddddd;
-	-moz-box-shadow: 3px 3px 4px #959494;
-	-webkit-box-shadow: 3px 3px 4px #959494;
-	box-shadow: 3px 3px 4px #959494;	
-}
-
 .view-contact-name {
 	font-variant: small-caps;
 }
@@ -2186,6 +1897,10 @@ margin-left: 90px;
 	margin-bottom: 10px;
 }
 
+#side-follow-submit {
+	width: 70px;
+}
+
 #side-match-link {
 	width: 180px;
 	padding: 10px;
@@ -2268,7 +1983,7 @@ margin-left: 90px;
 	padding: 10px;
 }
 
-#side-follow-wrapper{
+#side-follow-wrapper {
 	font-size: 1em;
 	font-weight: bold;
 	font-stretch:semi-expanded;
@@ -2289,40 +2004,8 @@ margin-left: 90px;
 #contact-view-recent {
 	float: left;
 	width: 150px;
-	padding: 10px;
+	padding: 5px;
 	margin-bottom: 20px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-	background-color:#bdbdbd;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	padding: 5px 10px 5px 10px;
-	color: #efefef;
-	font-size: 1.2em;
-	text-align: center;	
-}
-
-#contact-view-recent:hover{
-	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;	
-}
-
-#contact-view-recent:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;	
-}
-
-#contact-view-recent a {
-	color: #efefef;
 }
 
 #contact-suggest {
@@ -2385,56 +2068,19 @@ margin-left: 90px;
 	padding-top: 10px;
 }
 
-#profile-tab-status-link:hover {
+#profile-tab-status-link {
 	border: 0px;
 	padding: 5px 10px 5px 10px;
 	font-style: bold;
-	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#profile-tab-status-link:active {
-	border: 0px;
-	padding: 5px 10px 5px 10px;
-	font-style: bold;
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#profile-tab-status-link a {
-	color: #efefef;
 }
 
 #uexport-link a {
 	color: #efefef;
 }
 
-#profile-tab-profile-link:hover {
+#profile-tab-profile-link {
 	border: 0px;
 	padding: 5px 10px 5px 10px;
-	font-style: bold;
-	color: #efefef;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-	background-color:#b20202;
-}
-
-#profile-tab-profile-link:active {
-	border: 0px;
-	padding: 5px 10px 5px 10px;
-	font-style: bold;
-	background-color: #b20202;
-	position:relative;
-	top:1px;
-}
-
-#profile-tab-profile-link a {
-	color: #efefef;
 }
 
 #uexport-link {
@@ -2564,13 +2210,13 @@ margin-left: 90px;
 	float: right;
 	display: inline;
 }
-#group-delete-icon-11 { position: absolute; left: 360px; top: 103px; }
+
 .group-delete-wrapper {
 	width: 90px;
 	display: inline;
 	padding: 5px;
 	margin-bottom: 10px;
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+/*	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -2579,10 +2225,10 @@ margin-left: 90px;
 	background-color:#bdbdbd;
 	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
-	border-radius:5px;
+	border-radius:5px;*/
 }
 
-.group-delete-wrapper:hover {
+/*.group-delete-wrapper:hover {
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
 	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@@ -2598,7 +2244,8 @@ margin-left: 90px;
 
 .group-delete-wrapper a {
 	color: #efefef;
-}
+	font-size: 0.9em;
+}*/
 
 #group-edit-desc { margin: 10px 0xp; }
 #group-new-text {font-size: 1.1em;}
@@ -2888,13 +2535,6 @@ tr {
 .directory-item {
 	float: left;
 	margin: 50px 50px 0px 0px;
-	padding: 10px;
-	background-color: #f1f1f1;
-	border: 1px solid #dedede;
-	margin-bottom: 5px;
-	-moz-box-shadow: 5px 5px 8px #959494;
-	-webkit-box-shadow: 5px 5px 8px #959494;
-	box-shadow: 5px 5px 8px #959494;	
 }
 
 .directory-details {
@@ -2932,7 +2572,9 @@ tr {
 .admin.link {
 	list-style-position: inside;
 	font-size: 1em;
-	padding: 3px;
+	padding: 5px;
+	width: 100px;
+	margin: 5px;
 }
 
 #adminpage dl {

view/theme/testbubble/wall_item.tpl

@@ -2,7 +2,7 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$id" 
 				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
 				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">

view/theme/testbubble/wallwall_item.tpl

@@ -1,12 +1,12 @@
 <div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
 				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
 				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
+			<div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id" 
 				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
                 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">

view/viewcontact_template.tpl

@@ -1,7 +1,7 @@
 
 <div class="view-contact-wrapper" id="view-contact-wrapper-$id" >
 	<div class="view-contact-photo-wrapper" >
-		<div class="view-contact-photo" id="view-contact-photo-$id" >
+		<div class="mframe view-contact-photo" id="view-contact-photo-$id" >
 			<a href="$url" title="$alt_text" /><img src="$thumb" alt="$name" /></a>
 		</div>
 		<div class="view-contact-photo-end" ></div>

view/wallwall_item.tpl

@@ -1,12 +1,12 @@
 {#<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
 				<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
 				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
+			<div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id" 
 				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
                 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">

view/xrd_host.tpl

@@ -2,7 +2,7 @@
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
      xmlns:hm='http://host-meta.net/xrd/1.0'>
  
-    <hm:Host>$zroot</hm:Host>
+    <hm:Host>$zhost</hm:Host>
  
     <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
     <Link rel='acct-mgmt' href='$domain/amcd' />