Merge commit 'mike/master'

23 files changed, 49 insertions, 171 deletions

diff --git a/view/de/register-link.tpl b/view/de/register-link.tpl
deleted file mode 100644
index cf9d7976d..000000000
--- a/view/de/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" name="Neuen Account anlegen" id="register-link" >Registrieren</a>
diff --git a/view/de/strings.php b/view/de/strings.php
index cc0319606..d17037f6d 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -175,7 +175,11 @@ $a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Global Directory'] = 'Weltweites Verzeichnis';
 $a->strings['Private Message'] = 'Private Nachricht';
 $a->strings['This is you'] = 'Das bist du';
-$a->strings['View $name\'s profile'] = 'Profile von $name';
+$a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name';
+$a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name';
+$a->strings['to'] = 'to';
+$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
+$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Eintrag wurde entfernt.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['The profile address specified does not provide adequate information.'] = 'Die angegebene Profiladresse liefert unzureichende Informationen.';
diff --git a/view/de/wall_item_drop.tpl b/view/de/wall_item_drop.tpl
deleted file mode 100644
index 7b267f314..000000000
--- a/view/de/wall_item_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a
-href="item/drop/$id" onclick="return confirmDelete();" ><img
-src="images/b_drophide.gif" alt="Löschen" title="Löschen" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
-		<div class="wall-item-delete-end"></div>
diff --git a/view/de/wallwall_item.tpl b/view/de/wallwall_item.tpl
deleted file mode 100644
index b9a655582..000000000
--- a/view/de/wallwall_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<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" >
-		<span class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="Gehe zum Profil von $owner_name" 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" height="80" width="80" alt="$owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
-				<a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-				$vote
-			</div>
-		</span>
-		<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">
-		$plink
-		$drop
-		</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-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
diff --git a/view/en/logout.tpl b/view/en/logout.tpl
deleted file mode 100644
index 9a6c1d763..000000000
--- a/view/en/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="Logout" />
-</div>
-</form>
diff --git a/view/en/register-link.tpl b/view/en/register-link.tpl
deleted file mode 100644
index 7f3fca4d6..000000000
--- a/view/en/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" name="Create a New Account" id="register-link" >Register</a>
diff --git a/view/en/wall_item_drop.tpl b/view/en/wall_item_drop.tpl
deleted file mode 100644
index 66777db15..000000000
--- a/view/en/wall_item_drop.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
-		<div class="wall-item-delete-end"></div>
diff --git a/view/fr/logout.tpl b/view/fr/logout.tpl
deleted file mode 100644
index 9a6c1d763..000000000
--- a/view/fr/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="Logout" />
-</div>
-</form>
diff --git a/view/fr/register-link.tpl b/view/fr/register-link.tpl
deleted file mode 100644
index 7f3fca4d6..000000000
--- a/view/fr/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" name="Create a New Account" id="register-link" >Register</a>
diff --git a/view/fr/wall_item_drop.tpl b/view/fr/wall_item_drop.tpl
deleted file mode 100644
index 66777db15..000000000
--- a/view/fr/wall_item_drop.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
-		<div class="wall-item-delete-end"></div>
diff --git a/view/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl
deleted file mode 100644
index 02af17a64..000000000
--- a/view/fr/wallwall_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<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" >
-		<span class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="View $owner_name's profile" 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" height="80" width="80" alt="$owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
-				<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-				$vote
-			</div>
-		</span>
-		<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">
-		$plink
-		$drop
-		</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-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
diff --git a/view/it/logout.tpl b/view/it/logout.tpl
deleted file mode 100644
index 0a6868e0a..000000000
--- a/view/it/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="Esci" />
-</div>
-</form>
diff --git a/view/it/register-link.tpl b/view/it/register-link.tpl
deleted file mode 100644
index 67fc37b22..000000000
--- a/view/it/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" name="Crea un nuovo account" id="register-link" >Registrati</a>
diff --git a/view/it/strings.php b/view/it/strings.php
index 2b4a84d05..7f4b3eddd 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -140,6 +140,10 @@ $a->strings['Item not found.'] = 'Elemento non trovato.';
 $a->strings['Private Message'] = 'Messaggio privato';
 $a->strings['This is you'] = 'Questo sei tu';
 $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name';
+$a->strings['View $owner_name\'s profile'] = Guarda il profilo di $owner_name';
+$a->strings['to'] = 'a';
+$a->strings['Wall-to-Wall'] = 'Bacheca-A-Bacheca';
+$a->strings['via Wall-To-Wall:'] = 'via Bacheca-A-Bacheca';
 $a->strings['Item has been removed.'] = 'L\'elemento è stato rimosso.';
 $a->strings['The profile address specified does not provide adequate information.'] = 'L\'indirizzo del profilo specificato non fornisce adeguate informazioni';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Profilo limitato. Questa persona non sara\' in grado di ricevere nofiche dirette/personali da te.';
diff --git a/view/it/wall_item_drop.tpl b/view/it/wall_item_drop.tpl
deleted file mode 100644
index f4ef81c52..000000000
--- a/view/it/wall_item_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-<a href="item/drop/$id" onclick="return confirmDelete();" >
-<img src="images/b_drophide.gif" alt="Cancella" title="Cancella" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >
-</a>
-</div>
-
-		<div class="wall-item-delete-end">
-</div>
-
diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl
deleted file mode 100644
index bcb420748..000000000
--- a/view/it/wallwall_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<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" >
-		<span class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="Guarda il profilo di $owner_name" 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" height="80" width="80" alt="$owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Bacheca-A-Bacheca" /></div>
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="Guarda il profilo di $name" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-			</div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
-				<a href="$profile_url" title="Guarda il profilo di $name" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> a <a href="$owner_url" title="Guarda il profilo di $owner_name" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Bacheca-A-Bacheca:<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-				$vote
-			</div>
-		</span>
-		<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">
-		$plink
-		$drop
-		</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-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
diff --git a/view/de/logout.tpl b/view/logout.tpl
index 9a6c1d763..6a84a5bbc 100644
--- a/view/de/logout.tpl
+++ b/view/logout.tpl
@@ -1,6 +1,6 @@
 <form action="" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="Logout" />
+<input type="submit" name="submit" id="logout-button" value="$logout" />
 </div>
 </form>
diff --git a/view/register-link.tpl b/view/register-link.tpl
new file mode 100644
index 000000000..802c5f99f
--- /dev/null
+++ b/view/register-link.tpl
@@ -0,0 +1 @@
+	<a href="register" title = "$title" id="register-link" >$desc</a>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a820c381c..3877fb2ea 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -849,6 +849,10 @@ input#dfrn-url {
 	float: left;
 }
 
+.wallwall .wall-item-photo-end {
+	clear: both;
+}
+
 .wall-item-arrowphoto-wrapper {
 	margin-top: 40px;
 	margin-right: 20px;
@@ -2025,3 +2029,14 @@ a.mail-list-link {
 .today {
 	color: #FF0000;
 }
+
+.settings-block {
+	border: 1px solid #AAA;
+	margin: 10px;
+	padding: 10px;
+}
+
+.app-title {
+	margin: 10px;
+}
+
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 145123aaf..7e8299eb5 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2073,3 +2073,16 @@ a.mail-list-link {
 .today {
 	color: #FF0000;
 }
+
+
+.settings-block {
+	border: 1px solid #AAA;
+	margin: 10px;
+	padding: 10px;
+}
+
+
+.app-title {
+	margin: 10px;
+}
+
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 7f5f3af26..1cad41118 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -2,13 +2,13 @@
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<span class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="$title" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+				<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" height="80" width="80" alt="$name" /></a>
 			</div>
-	
+			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
 				$lock
-				<a href="$profile_url" title="$title" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+				<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 class="wall-item-location" id="wall-item-location-$id">$location</div>
 				$vote
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
new file mode 100644
index 000000000..9aa565f69
--- /dev/null
+++ b/view/wall_item_drop.tpl
@@ -0,0 +1,2 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
+		<div class="wall-item-delete-end"></div>
diff --git a/view/en/wallwall_item.tpl b/view/wallwall_item.tpl
index 02af17a64..6e61ce4f0 100644
--- a/view/en/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -2,17 +2,18 @@
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<span class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$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" height="80" width="80" alt="$owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-				<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+				<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" height="80" width="80" alt="$name" /></a>
 			</div>
+			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
 				$lock
-				<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
+				<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> $to <a href="$owner_url" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
 				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
 				$vote