aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-09 00:17:47 -0800
committerFriendika <info@friendika.com>2011-03-09 00:17:47 -0800
commit5f54503780ac6f94bbfe2692682aab5355673d16 (patch)
treeeda97fe45305551671996491d85ce3aded90d49a
parent0de88eb6b0e5ceab470240a54414317884a49101 (diff)
parent37a87b0f58c61a58303230f2ca997c5e81f1f908 (diff)
downloadvolse-hubzilla-5f54503780ac6f94bbfe2692682aab5355673d16.tar.gz
volse-hubzilla-5f54503780ac6f94bbfe2692682aab5355673d16.tar.bz2
volse-hubzilla-5f54503780ac6f94bbfe2692682aab5355673d16.zip
Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11
-rw-r--r--mod/network.php8
-rw-r--r--mod/profile.php4
-rw-r--r--view/theme/duepuntozero/style.css53
-rw-r--r--view/wall_item.tpl11
-rw-r--r--view/wallwall_item.tpl12
5 files changed, 62 insertions, 26 deletions
diff --git a/mod/network.php b/mod/network.php
index 6f9e84b70..32c7216d4 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -255,8 +255,8 @@ function network_content(&$a, $update = 0) {
}
}
- $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
- $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+ $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+ $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
if($coord) {
if($location)
$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
@@ -412,8 +412,8 @@ function network_content(&$a, $update = 0) {
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
- $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+ $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+ $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
if($coord) {
if($location)
$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
diff --git a/mod/profile.php b/mod/profile.php
index 9375b670b..5615573b9 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -363,8 +363,8 @@ function profile_content(&$a, $update = 0) {
$like = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
- $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+ $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+ $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
if($coord) {
if($location)
$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index bfe524b01..bc6e63edb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -833,31 +833,40 @@ input#dfrn-url {
.wall-item-info {
display: block;
float: left;
- width:150px;
+ width:110px;
+ margin-right:10px;
}
-.wallwall .wall-item-info {
- width: 300px;
+.comment .wall-item-info {
+ width: 70px;
}
-
.wall-item-photo-wrapper {
margin-top: 10px;
margin-left: 10px;
margin-bottom: 10px;
width: 100px;
}
-.wallwall .wall-item-photo-wrapper {
- float: left;
-}
+.wallwall .wwto {
+ left: 50px;
+ margin: 0;
+ position: absolute;
+ top: 70px;
+ width: 30px
+}
+.wallwall .wwto img {
+ width: 30px;
+ height: 30px;
+}
.wallwall .wall-item-photo-end {
clear: both;
}
.wall-item-arrowphoto-wrapper {
- margin-top: 40px;
- margin-right: 20px;
- float: left;
+ position: absolute;
+ left: 75px;
+ top: 70px;
+ z-index: 100;
}
.wall-item-wrapper {
/*float: left;
@@ -868,16 +877,38 @@ input#dfrn-url {
.wall-item-lock {
/*height: 20px;*/
/*margin-top: 10px;*/
- left: 135px;
+ left: 105px;
position: absolute;
top: 1px;
}
+.comment .wall-item-lock {
+ left: 65px;
+}
.wall-item-ago {
color: #888888;
font-size: 0.8em;
}
+.wall-item-location {
+ overflow: hidden;
+ /* add ellipsis on text overflow */
+ /* this work on safari, opera, ie, chrome. */
+ /* firefox users have to wait support or we */
+ /* can use a jquery plugin http://bit.ly/zJskg */
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ width: 100%;
+}
+
+.wall-item-like-buttons {
+ float: left;
+ margin-right: 10px;
+ padding-right: 10px;
+ border-right: 2px solid #fff;
+}
+
+
.wall-item-like-buttons img {
cursor: pointer;
}
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 1cad41118..5cae6b142 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -8,18 +8,21 @@
<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>
- <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 class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</span>
+ <div class="wall-item-author">
+ <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+
+ </div>
<div 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">
+ $vote
$plink
$drop
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 6e61ce4f0..256320a46 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,30 +1,32 @@
<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" >
+ <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" 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" >
+ <div class="wall-item-photo-wrapper wwfrom" 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-author">
+ <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $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>
<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">
+ $vote
$plink
$drop
</div>