]> git.mxchange.org Git - friendica.git/commitdiff
generalise wallwall template and fix "via wall-to-wall" float
authorFriendika <info@friendika.com>
Thu, 24 Feb 2011 10:32:46 +0000 (02:32 -0800)
committerFriendika <info@friendika.com>
Thu, 24 Feb 2011 10:32:46 +0000 (02:32 -0800)
13 files changed:
mod/display.php
mod/network.php
mod/profile.php
util/strings.php
view/de/strings.php
view/de/wallwall_item.tpl [deleted file]
view/en/wallwall_item.tpl [deleted file]
view/fr/wallwall_item.tpl [deleted file]
view/it/strings.php
view/it/wallwall_item.tpl [deleted file]
view/theme/duepuntozero/style.css
view/wall_item.tpl
view/wallwall_item.tpl [new file with mode: 0644]

index bdf6a6f974f4a19c0f99645c14d00ccdda14a4e5..da931335c15f3a8eca8374bf89467eb4039429b0 100644 (file)
@@ -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,
index 79a2f2b3896c6490acc789abc7b705b197ff3e7d..a9de402a83620482061b4cb24b914ee7a82a02e7 100644 (file)
@@ -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,
index 46d13298e004e6eb22c35f1401be1f6c41f4437d..5cab6662afbc21fb76cfa645398f1617d4990612 100644 (file)
@@ -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,
index f1fb57751a63a1c407d9e2430d98fffc7ab21a9c..f74f69584e69897ea23f28ca29f612c53522c666 100644 (file)
@@ -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 <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.'] = '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';
index cc031960664887c7a1a2e433f9a4e87c336e035d..d17037f6d6688e850f79f2aa222465b4f95b8059 100644 (file)
@@ -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/wallwall_item.tpl b/view/de/wallwall_item.tpl
deleted file mode 100644 (file)
index b9a6555..0000000
+++ /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/wallwall_item.tpl b/view/en/wallwall_item.tpl
deleted file mode 100644 (file)
index 02af17a..0000000
+++ /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/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl
deleted file mode 100644 (file)
index 02af17a..0000000
+++ /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>
-
index 2b4a84d052802b2d11e025315d930e86a96f7821..7f4b3eddd5be817747c8c50db0e969ef1c60bb69 100644 (file)
@@ -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 (file)
index bcb4207..0000000
+++ /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>
-
index 2bffc2f17d9cd9918ad20e284b60468dac233304..3877fb2ea6b8ef085865eadb213acc5ac013e98d 100644 (file)
@@ -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;
index 7f5f3af2656096087e28be32e6fd926b3978364d..1cad411182c859a3be9235ef95cef959a6669720 100644 (file)
@@ -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/wallwall_item.tpl b/view/wallwall_item.tpl
new file mode 100644 (file)
index 0000000..6e61ce4
--- /dev/null
@@ -0,0 +1,42 @@
+<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="$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" /></div>
+                       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$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="$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
+                       </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>
+