Merge remote-tracking branch 'friendika-master/master'

author: Fabio Comuni <fabrix.xm@gmail.com> 2011-03-30 16:05:43 +0200
committer: Fabio Comuni <fabrix.xm@gmail.com> 2011-03-30 16:05:43 +0200
commit: 9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch)
tree: 073576560eaa6e00266c3e85a5e76df6e1dca032 /view
parent: 05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff)
parent: 18da7efa27fcff8fb2b3b679938954e712427de9 (diff)
download: volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip
36 files changed, 89 insertions, 864 deletions
diff --git a/view/en/cropbody.tpl b/view/cropbody.tpl
index 39395af8e..c9c0f84de 100644
--- a/view/en/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -1,9 +1,9 @@
-<h1>Crop Image</h1>
+<h1>$title</h1>
 <p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
+$desc
 </p>
 <div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
 </div>
 <div id="cropimage-preview-wrapper" >
 <div id="previewWrap" ></div>
@@ -41,7 +41,6 @@ Please adjust the image cropping for optimum viewing.
 
 <form action="profile_photo/$resource" id="crop-image-form" method="post" />
 
-<input type="hidden" name="imagename" value="$hash" />
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
 <input type="hidden" name="ystart" id="y1" />
@@ -51,7 +50,7 @@ Please adjust the image cropping for optimum viewing.
 <input type="hidden" name="width"  id="width" />
 
 <div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
+<input type="submit" name="submit" value="$done" />
 </div>
 
 </form>
diff --git a/view/de/cropbody.tpl b/view/de/cropbody.tpl
deleted file mode 100644
index 0211fe308..000000000
--- a/view/de/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>Bild zuschneiden</h1>
-<p id="cropimage-desc">
-Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
-zugeschnitten werden. Bitte wähle diesen Bereich.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>
diff --git a/view/de/head.tpl b/view/de/head.tpl
deleted file mode 100644
index 17b7706f8..000000000
--- a/view/de/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/de/intros-top.tpl b/view/de/intros-top.tpl
deleted file mode 100644
index e65da1a3f..000000000
--- a/view/de/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/de/profile.php b/view/de/profile.php
deleted file mode 100644
index 40b6abd55..000000000
--- a/view/de/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">In Verbindung treten</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Standort:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Geschlecht: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/de/registrations-top.tpl b/view/de/registrations-top.tpl
deleted file mode 100644
index d788b515d..000000000
--- a/view/de/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Schwebende Neuanmeldungen</h1>
-
-
diff --git a/view/de/settings_nick_unset.tpl b/view/de/settings_nick_unset.tpl
deleted file mode 100644
index 2a56fda7a..000000000
--- a/view/de/settings_nick_unset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
-Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
-z.B. <strong>'spitzname@$basepath'</strong>.
-<br />
-Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
-<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
-Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/en/head.tpl b/view/en/head.tpl
deleted file mode 100644
index 8f97a11e5..000000000
--- a/view/en/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/en/intros-top.tpl b/view/en/intros-top.tpl
deleted file mode 100644
index d8b7394a4..000000000
--- a/view/en/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Pending Friend/Connect Notifications</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/en/profile.php b/view/en/profile.php
deleted file mode 100644
index fa7372668..000000000
--- a/view/en/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
deleted file mode 100644
index d8faf3439..000000000
--- a/view/en/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>User registrations waiting for confirm</h1>
-
-
diff --git a/view/en/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl
deleted file mode 100644
index 903768b59..000000000
--- a/view/en/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
-<strong>'nickname@$basepath'</strong>.
-<br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/fr/cropbody.tpl b/view/fr/cropbody.tpl
deleted file mode 100644
index 6c509ce1d..000000000
--- a/view/fr/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Merci d'ajuster le cadre de l'image pour un affichage optimal.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Edition terminée" />
-</div>
-
-</form>
diff --git a/view/fr/head.tpl b/view/fr/head.tpl
deleted file mode 100644
index 4636b542c..000000000
--- a/view/fr/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Effacer cet élément?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/fr/intros-top.tpl b/view/fr/intros-top.tpl
deleted file mode 100644
index 85dd628b6..000000000
--- a/view/fr/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Demandes d'amitié/mise en relation en attente</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/fr/profile.php b/view/fr/profile.php
deleted file mode 100644
index 9c5d6dce6..000000000
--- a/view/fr/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Localisation:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Genre: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl
deleted file mode 100644
index 3988f7822..000000000
--- a/view/fr/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>
-
-
diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl
deleted file mode 100644
index 60c7a4a45..000000000
--- a/view/fr/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
-Choisir un pseudo vous donnera une URL plus simple à retenir, comme 
-<strong>'nickname@$basepath'</strong>.
-<br />
-Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
-</p>
-<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/sv/head.tpl b/view/head.tpl
index 828fcb13d..7a5710b2a 100644
--- a/view/sv/head.tpl
+++ b/view/head.tpl
@@ -11,9 +11,9 @@
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
 <script>
 
-	function confirmDelete() { return confirm("Ta bort?"); }
+	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
+		if(obj.value == '$comment') {
 			obj.value = '';
 			obj.className = "comment-edit-text-full";
 			openMenu("comment-edit-submit-wrapper-" + id);
@@ -21,10 +21,12 @@
 	}
 	function commentClose(obj,id) {
 		if(obj.value == '') {
-			obj.value = 'Comment';
+			obj.value = '$comment';
 			obj.className="comment-edit-text-empty";
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
 
 </script>
+
+
diff --git a/view/it/cropbody.tpl b/view/it/cropbody.tpl
deleted file mode 100644
index fe072f0b5..000000000
--- a/view/it/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Ritaglia Immagine</h1>
-<p id="cropimage-desc">
-Sistema il ritaglio dell'immagine per una visualizzazione ottimale.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Fatto" />
-</div>
-
-</form>
diff --git a/view/it/head.tpl b/view/it/head.tpl
deleted file mode 100644
index 8e4e0ccd7..000000000
--- a/view/it/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Cancellare questo elemento?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/it/intros-top.tpl b/view/it/intros-top.tpl
deleted file mode 100644
index d096dcfb8..000000000
--- a/view/it/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Notifiche di Amicizia/Collegamento in Attesa</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/it/profile.php b/view/it/profile.php
deleted file mode 100644
index 5ecffb3a5..000000000
--- a/view/it/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connetti</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
deleted file mode 100644
index 8134aa210..000000000
--- a/view/it/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Registrazioni in attesa di conferma</h1>
-
-
diff --git a/view/it/settings_nick_unset.tpl b/view/it/settings_nick_unset.tpl
deleted file mode 100644
index 8f4cba475..000000000
--- a/view/it/settings_nick_unset.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-L'URL del tuo profilo &egrave; <strong>'$baseurl/profile/$uid'</strong>.
-Impostare un soprannome permetter&agrave; di avere un URL più aimchevole, come
-<strong>'soprannome@$basepath'</strong>.
-<br />
-Una volta impostato, non potr&agreve; pi&ugrave; essere cambiato. Il soprannome <strong>deve</strong>
-cominciare con una lettera; nel soprannome sono permessi solo lettere, numeri, trattini (-) e underscore (_).
-</p>
-<label id="settings-nick-label" for="settings-nick" >Soprannome: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 774b37c86..eebaf803a 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -126,6 +126,13 @@ tinyMCE.init({
 		}
 	}
 
+	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) {
diff --git a/view/jot.tpl b/view/jot.tpl
index fd85b9267..f5010301f 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -12,6 +12,7 @@
 		<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" />
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >$content</textarea>
@@ -40,6 +41,10 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="$noloc" title="$noloc" onclick="jotClearLocation();" />
 	</div> 
+	<div id="profile-title-wrapper" style="display: $visitor;" >
+		<img id="profile-title" src="images/article.gif" alt="$title" title="$title" onclick="jotTitle();" />
+	</div> 
+
 	<div id="profile-jot-plugin-wrapper">
   	$jotplugins
 	</div>
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
new file mode 100644
index 000000000..c7e6df498
--- /dev/null
+++ b/view/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>$base</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+
+    <Link 
+        rel="icon" 
+        href="$base/images/friendika-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="$base/images/friendika-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="$base/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl
deleted file mode 100644
index a91a7eafc..000000000
--- a/view/sv/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Besk&auml;r bilden</h1>
-<p id="cropimage-desc">
-V&auml;lj hur du vill att bilden ska besk&auml;ras.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Spara" />
-</div>
-
-</form>
-\ No newline at end of file
diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl
deleted file mode 100644
index 0aa01c5da..000000000
--- a/view/sv/intros-top.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
diff --git a/view/sv/profile.php b/view/sv/profile.php
deleted file mode 100644
index 6c551e185..000000000
--- a/view/sv/profile.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Plats:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">K&ouml;n: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl
deleted file mode 100644
index 24e13abca..000000000
--- a/view/sv/registrations-top.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>
diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl
deleted file mode 100644
index 5e115ff68..000000000
--- a/view/sv/settings_nick_unset.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
-Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
-<strong>'nickname@$basepath'</strong>.
-<br />
-N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;ndas.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0d89fa3b1..042cc380f 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -215,7 +215,8 @@ div.wall-item-content-wrapper.shiny {
 #profile-youtube, 
 #profile-video, 
 #profile-audio,
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1056,41 +1057,45 @@ input#dfrn-url {
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2099,7 +2104,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 
 .tool-link {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 4d2ca6d63..a61838157 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -111,7 +111,8 @@ blockquote:before {
 #profile-youtube, 
 #profile-video,
 #profile-audio, 
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1119,41 +1120,46 @@ padding: 5px 10px 0px;
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2115,7 +2121,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 .tool-link {
   cursor: pointer;
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index fae70dec9..f843df31e 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -7,5 +7,6 @@
     <Link rel='lrdd' template='http://$domain/xrd/?uri={uri}' />
     <Link rel='acct-mgmt' href='http://$domain/amcd' />
     <Link rel='http://services.mozilla.com/amcd/0.1' href='http://$domain/amcd' />
-
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+		href="http://$domain/oexchange/xrd" />
 </XRD>
author	Fabio Comuni <fabrix.xm@gmail.com>	2011-03-30 16:05:43 +0200
committer	Fabio Comuni <fabrix.xm@gmail.com>	2011-03-30 16:05:43 +0200
commit	9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch)
tree	073576560eaa6e00266c3e85a5e76df6e1dca032 /view
parent	05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff)
parent	18da7efa27fcff8fb2b3b679938954e712427de9 (diff)
download	volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2 volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip