From e776024b3a99e84fcf4351b23b76b695022d3f69 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 15:40:23 +0100 Subject: [PATCH 1/4] Fix IT strings --- view/it/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/it/strings.php b/view/it/strings.php index 25439d8d5..1cee5399a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -140,7 +140,7 @@ $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['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'; From 33264dc2941dda39bc024517ce70efece8d90ac4 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 16:50:10 +0100 Subject: [PATCH 2/4] Add title attribute to location links --- mod/network.php | 8 ++++---- mod/profile.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/network.php b/mod/network.php index 1ef4ab372..7e7a5ea39 100644 --- a/mod/network.php +++ b/mod/network.php @@ -255,8 +255,8 @@ function network_content(&$a, $update = 0) { } } - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; @@ -407,8 +407,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']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; diff --git a/mod/profile.php b/mod/profile.php index b23af2e66..5424a2884 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -358,8 +358,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']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; From b00abf7e329de95791f1e50e39a2eba37ba73f10 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 16:51:14 +0100 Subject: [PATCH 3/4] reworked items template --- view/theme/duepuntozero/style.css | 48 +++++++++++++++++++++++++++---- view/wall_item.tpl | 11 ++++--- view/wallwall_item.tpl | 12 ++++---- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bfe524b01..2c271218a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -833,10 +833,14 @@ input#dfrn-url { .wall-item-info { display: block; float: left; - width:150px; + width:110px; + margin-right:10px; +} +.comment .wall-item-info { + width: 70px; } .wallwall .wall-item-info { - width: 300px; + width: 170px; } @@ -846,8 +850,13 @@ input#dfrn-url { margin-bottom: 10px; width: 100px; } -.wallwall .wall-item-photo-wrapper { +/*.wallwall .wall-item-photo-wrapper { float: left; +}*/ +.wallwall .wwfrom { + left: 75px; + position: absolute; + top: 0; } .wallwall .wall-item-photo-end { @@ -855,9 +864,13 @@ input#dfrn-url { } .wall-item-arrowphoto-wrapper { - margin-top: 40px; + /*margin-top: 40px; margin-right: 20px; - float: left; + float: left;*/ + position: absolute; + left: 70px; + top: 70px; + z-index: 100; } .wall-item-wrapper { /*float: left; @@ -868,16 +881,39 @@ 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; + white-space: nowrap; + 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 @@
$lock - $name -
$ago
-
$location
- $vote +
$location
+
+ $name +
$ago
+ +
$title
$body
+ $vote $plink $drop
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 @@
-
+
$wall
-
+
$lock - $name $to $owner_name $vwall
-
$ago
$location
- $vote
+
+ $name $to $owner_name $vwall
+
$ago
+
$title
$body
+ $vote $plink $drop
From 37a87b0f58c61a58303230f2ca997c5e81f1f908 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 9 Mar 2011 08:43:17 +0100 Subject: [PATCH 4/4] reworked wall-to-wall style --- view/theme/duepuntozero/style.css | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 2c271218a..bc6e63edb 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -839,10 +839,6 @@ input#dfrn-url { .comment .wall-item-info { width: 70px; } -.wallwall .wall-item-info { - width: 170px; -} - .wall-item-photo-wrapper { margin-top: 10px; @@ -850,25 +846,25 @@ input#dfrn-url { margin-bottom: 10px; width: 100px; } -/*.wallwall .wall-item-photo-wrapper { - float: left; -}*/ -.wallwall .wwfrom { - left: 75px; - position: absolute; - top: 0; -} +.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: 70px; + left: 75px; top: 70px; z-index: 100; } @@ -902,7 +898,6 @@ input#dfrn-url { /* can use a jquery plugin http://bit.ly/zJskg */ text-overflow: ellipsis; -o-text-overflow: ellipsis; - white-space: nowrap; width: 100%; }