diff --git a/mod/display.php b/mod/display.php index bdf6a6f97..da931335c 100644 --- a/mod/display.php +++ b/mod/display.php @@ -258,7 +258,11 @@ function display_content(&$a) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), + '$olinktitle' => t('View $owner_name\'s profile'), + '$to' => t('to'), + '$wall' => t('Wall-to-Wall'), + '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, '$name' => $profile_name, '$sparkle' => $sparkle, diff --git a/mod/network.php b/mod/network.php index 79a2f2b38..a9de402a8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -412,7 +412,11 @@ function network_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), + '$olinktitle' => t('View $owner_name\'s profile'), + '$to' => t('to'), + '$wall' => t('Wall-to-Wall'), + '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/mod/profile.php b/mod/profile.php index 46d13298e..5cab6662a 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -360,7 +360,7 @@ function profile_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/util/strings.php b/util/strings.php index f1fb57751..f74f69584 100644 --- a/util/strings.php +++ b/util/strings.php @@ -12,6 +12,7 @@ $a->strings['Nickname/Email/OpenID: '] = 'Nickname/Email/OpenID: '; $a->strings["Password \x28if not OpenID\x29: "] = "Password \x28if not OpenID\x29: "; $a->strings['Forgot your password?'] = 'Forgot your password?'; $a->strings['Password Reset'] = 'Password Reset'; +$a->strings['Logout'] = 'Logout'; $a->strings['prev'] = 'prev'; $a->strings['first'] = 'first'; $a->strings['last'] = 'last'; @@ -193,6 +194,10 @@ $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; $a->strings['This is you'] = 'This is you'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; +$a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile'; +$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.'] = 'Item has been removed.'; $a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; @@ -426,7 +431,6 @@ $a->strings[' ago'] = ' ago'; $a->strings['Create a new group'] = 'Create a new group'; $a->strings['Everybody'] = 'Everybody'; $a->strings['Birthday:'] = 'Birthday:'; -$a->strings['Logout'] = 'Logout'; $a->strings['Home'] = 'Home'; $a->strings['Apps'] = 'Apps'; $a->strings['Directory'] = 'Directory'; 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 Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; $a->strings['The profile address specified does not provide adequate information.'] = 'Die angegebene Profiladresse liefert unzureichende Informationen.'; 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 @@ -
-
- -
- - $owner_name -
-
Wall-To-Wall
-
- - $name -
-
- $lock - $name to $owner_name via Wall-To-Wall:
-
$ago
-
$location
- $vote -
- -
-
$title
-
-
$body
-
-
- $plink - $drop -
-
-
-
$like
-
$dislike
-
-
- $comment -
-
- -
- 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 @@ -
-
- -
- - $owner_name -
-
Wall-To-Wall
-
- - $name -
-
- $lock - $name to $owner_name via Wall-To-Wall:
-
$ago
-
$location
- $vote -
- -
-
$title
-
-
$body
-
-
- $plink - $drop -
-
-
-
$like
-
$dislike
-
-
- $comment -
-
- -
- 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/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 @@ -
-
- -
- - $owner_name -
-
Bacheca-A-Bacheca
-
- - $name -
-
- $lock - $name a $owner_name via Bacheca-A-Bacheca:
-
$ago
-
$location
- $vote -
- -
-
$title
-
-
$body
-
-
- $plink - $drop -
-
-
-
$like
-
$dislike
-
-
- $comment -
-
- -
- diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 2bffc2f17..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; 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 @@
- +
$lock - $name + $name
$ago
$location
$vote diff --git a/view/en/wallwall_item.tpl b/view/wallwall_item.tpl similarity index 72% rename from view/en/wallwall_item.tpl rename to view/wallwall_item.tpl index 02af17a64..6e61ce4f0 100644 --- a/view/en/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -2,17 +2,18 @@
-
Wall-To-Wall
+
$wall
+
$lock - $name to $owner_name via Wall-To-Wall:
+ $name $to $owner_name $vwall
$ago
$location
$vote