From dc15e8640de0fcd77bf91b97aee6f890b34ba6cb Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 16 Feb 2011 12:49:16 +0100 Subject: [PATCH 1/2] duepuntozero: show desc on image in albums --- mod/photos.php | 5 +++-- view/photo_album.tpl | 7 ++++-- view/theme/duepuntozero/style.css | 36 ++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index a44eb5a5f5..ebfe714a78 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -831,7 +831,7 @@ function photos_content(&$a) { $a->set_pager_itemspage(20); } - $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -873,7 +873,8 @@ function photos_content(&$a) { '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', - '$imgalt' => $rr['filename'] + '$imgalt' => $rr['filename'], + '$desc'=> $rr['desc'] )); } diff --git a/view/photo_album.tpl b/view/photo_album.tpl index 323a9cdff5..fab7d7254c 100644 --- a/view/photo_album.tpl +++ b/view/photo_album.tpl @@ -1,5 +1,8 @@ -
- $imgalt + + $imgalt +

$desc

+ +
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ac3562d1c0..022e0929ea 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1586,8 +1586,22 @@ a.mail-list-link { .photo-album-image-wrapper { float: left; margin-top: 15px; - height: 350px; - width: 350px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; + position: relative; +} +.photo-album-image-wrapper .caption { + display: none; + width: 100%; + position: absolute; + bottom: 0px; + padding: 0.5em 0.5em 0px 0.5em; + background-color: rgba(255, 255, 255, 0.8); + margin: 0px; +} +.photo-album-image-wrapper a:hover .caption { + display:block; } #photo-album-end { @@ -1595,12 +1609,22 @@ a.mail-list-link { } .photo-top-image-wrapper { + position: relative; float: left; margin-top: 15px; - height: 350px; - width: 350px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); } - #photo-top-end { clear: both; } @@ -1928,3 +1952,5 @@ a.mail-list-link { .tool-link { cursor: pointer; } + + From f5557763d257e62d6ab074659fa9a0ea221f73a4 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 17 Feb 2011 17:29:29 +0100 Subject: [PATCH 2/2] Updates to theme dupuntozero --- view/de/wallwall_item.tpl | 39 +++++++++------- view/en/wallwall_item.tpl | 39 +++++++++------- view/fr/wallwall_item.tpl | 39 +++++++++------- view/it/wallwall_item.tpl | 39 +++++++++------- view/search_item.tpl | 26 ++++++----- view/theme/duepuntozero/style.css | 78 ++++++++++++++++++++++--------- view/wall_item.tpl | 28 ++++++----- 7 files changed, 172 insertions(+), 116 deletions(-) diff --git a/view/de/wallwall_item.tpl b/view/de/wallwall_item.tpl index 67b6006cf0..cd7d24cf46 100644 --- a/view/de/wallwall_item.tpl +++ b/view/de/wallwall_item.tpl @@ -1,28 +1,31 @@ -
+
-
- - $owner_name -
-
Wall-To-Wall
-
- - $name -
- -
- $lock - $name to $owner_name via Wall-To-Wall:
-
$ago
-
$location
- $vote -
+ +
+ + $owner_name +
+
Wall-To-Wall
+
+ + $name +
+
+ $lock + $name to $owner_name via Wall-To-Wall:
+
$ago
+
$location
+ $vote +
+
$title
$body
+
$plink $drop +
diff --git a/view/en/wallwall_item.tpl b/view/en/wallwall_item.tpl index 9c6ad60708..2daec2bb05 100644 --- a/view/en/wallwall_item.tpl +++ b/view/en/wallwall_item.tpl @@ -1,28 +1,31 @@ -
+
-
- - $owner_name -
-
Wall-To-Wall
-
- - $name -
- -
- $lock - $name to $owner_name via Wall-To-Wall:
-
$ago
-
$location
- $vote -
+ +
+ + $owner_name +
+
Wall-To-Wall
+
+ + $name +
+
+ $lock + $name to $owner_name via Wall-To-Wall:
+
$ago
+
$location
+ $vote +
+
$title
$body
+
$plink $drop +
diff --git a/view/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl index 9c6ad60708..2daec2bb05 100644 --- a/view/fr/wallwall_item.tpl +++ b/view/fr/wallwall_item.tpl @@ -1,28 +1,31 @@ -
+
-
- - $owner_name -
-
Wall-To-Wall
-
- - $name -
- -
- $lock - $name to $owner_name via Wall-To-Wall:
-
$ago
-
$location
- $vote -
+ +
+ + $owner_name +
+
Wall-To-Wall
+
+ + $name +
+
+ $lock + $name to $owner_name via Wall-To-Wall:
+
$ago
+
$location
+ $vote +
+
$title
$body
+
$plink $drop +
diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl index 3c7883fc81..079f9b58f9 100644 --- a/view/it/wallwall_item.tpl +++ b/view/it/wallwall_item.tpl @@ -1,28 +1,31 @@ -
+
-
- - $owner_name -
-
Bacheca-A-Bacheca
-
- - $name -
- -
- $lock - $name a $owner_name via Bacheca-A-Bacheca:
-
$ago
-
$location
- $vote -
+ +
+ + $owner_name +
+
Bacheca-A-Bacheca
+
+ + $name +
+
+ $lock + $name a $owner_name via Bacheca-A-Bacheca:
+
$ago
+
$location
+ $vote +
+
$title
$body
+
$plink $drop +
diff --git a/view/search_item.tpl b/view/search_item.tpl index 5cd230cfa2..0547fd9efb 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -1,21 +1,25 @@
-
- - $name -
- -
- $lock - $name -
$ago
-
$location
-
+ +
+ + $name +
+ +
+ $lock + $name +
$ago
+
$location
+
+
$title
$body
+
$drop +
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b580df8296..008cce0599 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -650,14 +650,17 @@ input#dfrn-url { #profile-in-netdir-yes, #profile-in-netdir-no, #hide-friends-yes, -#hide-friends-no, -#settings-normal, -#settings-soapbox, -#settings-community, -#settings-freelove { +#hide-friends-no { float: left; margin-bottom: 20px; } +#settings-normal, +#settings-soapbox, +#settings-freelove, +#settings-community { + float: left; +} + #profile-in-dir-yes-label, #profile-in-dir-no-label, @@ -697,8 +700,12 @@ input#dfrn-url { #settings-soapbox-desc, #settings-community-desc, #settings-freelove-desc { - float: left; - margin-left: 75px; + /*float: left; + margin-left: 75px;*/ + clear: left; + color: #666666; + display: block; + margin-bottom: 20px } #profile-edit-profile-name-end, @@ -796,6 +803,7 @@ input#dfrn-url { .wall-item-content-wrapper { margin-top: 10px; border: 1px solid #CCC; + position: relative; } .wall-item-content-wrapper.comment { @@ -803,26 +811,43 @@ input#dfrn-url { background: #EEEEEE; } +.wall-item-info { + display: block; + float: left; + width:150px; +} +.wallwall .wall-item-info { + width: 300px; +} + + .wall-item-photo-wrapper { margin-top: 10px; margin-left: 10px; margin-bottom: 10px; width: 100px; +} +.wallwall .wall-item-photo-wrapper { float: left; } + .wall-item-arrowphoto-wrapper { margin-top: 40px; margin-right: 20px; float: left; } .wall-item-wrapper { - float: left; + /*float: left; margin-right: 5px; - width: 250px; + width: 250px;*/ + margin-left:10px; } .wall-item-lock { - height: 20px; - margin-top: 10px; + /*height: 20px;*/ + /*margin-top: 10px;*/ + left: 135px; + position: absolute; + top: 1px; } .wall-item-ago { @@ -836,14 +861,10 @@ input#dfrn-url { .wall-item-links-wrapper { float: left; - margin-bottom: 5px; - margin-left: 5px; } .wall-item-delete-wrapper { float: right; - margin-top: 5px; - margin-right: 5px; } .wall-item-delete-end { @@ -866,12 +887,15 @@ input#dfrn-url { .wall-item-photo { border: none; } +.comment .wall-item-photo { + width: 50px; height: 50px; +} .wall-item-content { - float: left; + /*float: left;*/ /*width: 450px;*/ margin-left: 10px; -/* margin-bottom: 20px;*/ - padding: 20px; + /*margin-bottom: 20px;*/ + /*padding: 20px;*/ max-height: 400px; overflow: auto; } @@ -879,15 +903,26 @@ input#dfrn-url { .wall-item-title { float: left; font-weight: bold; - width: 450px; + /*width: 450px;*/ } .wall-item-body { float: left; - width: 450px; + /*width: 450px;*/ margin-top: 10px; } +.wall-item-tools { + clear: both; + background-image: url("head.jpg"); + background-position: 0 -20px; + background-repeat: repeat-x; + padding: 5px 10px 0px; +} +.comment .wall-item-tools { + background:none; +} + .comment-edit-wrapper { margin-top: 15px; background: #f3f3f3; @@ -1604,7 +1639,8 @@ a.mail-list-link { position: absolute; bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; - background-color: rgba(255, 255, 255, 0.8); + background-color: rgba(245, 245, 255, 0.8); + border-bottom: 2px solid #CCC; margin: 0px; } .photo-album-image-wrapper a:hover .caption { diff --git a/view/wall_item.tpl b/view/wall_item.tpl index b9f27ed4ad..4d8b5daeea 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,23 +1,27 @@
-
- - $name -
- -
- $lock - $name -
$ago
-
$location
- $vote -
+ +
+ + $name +
+ +
+ $lock + $name +
$ago
+
$location
+ $vote +
+
$title
$body
+
$plink $drop +