aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mod/photos.php5
-rw-r--r--view/de/wallwall_item.tpl39
-rw-r--r--view/en/wallwall_item.tpl39
-rw-r--r--view/fr/wallwall_item.tpl39
-rw-r--r--view/it/wallwall_item.tpl39
-rw-r--r--view/photo_album.tpl7
-rw-r--r--view/search_item.tpl26
-rw-r--r--view/theme/duepuntozero/style.css110
-rw-r--r--view/wall_item.tpl28
9 files changed, 209 insertions, 123 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 27cb1beb1..d4835ba5e 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/de/wallwall_item.tpl b/view/de/wallwall_item.tpl
index 67b6006cf..cd7d24cf4 100644
--- a/view/de/wallwall_item.tpl
+++ b/view/de/wallwall_item.tpl
@@ -1,28 +1,31 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+<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" >
- <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 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-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>
diff --git a/view/en/wallwall_item.tpl b/view/en/wallwall_item.tpl
index 9c6ad6070..2daec2bb0 100644
--- a/view/en/wallwall_item.tpl
+++ b/view/en/wallwall_item.tpl
@@ -1,28 +1,31 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+<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" >
- <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 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-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>
diff --git a/view/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl
index 9c6ad6070..2daec2bb0 100644
--- a/view/fr/wallwall_item.tpl
+++ b/view/fr/wallwall_item.tpl
@@ -1,28 +1,31 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+<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" >
- <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 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-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>
diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl
index 3c7883fc8..079f9b58f 100644
--- a/view/it/wallwall_item.tpl
+++ b/view/it/wallwall_item.tpl
@@ -1,28 +1,31 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+<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" >
- <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 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-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>
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
index 323a9cdff..fab7d7254 100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
@@ -1,5 +1,8 @@
-
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
- <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" /></a>
+ <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
+ <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" />
+ <p class='caption'>$desc</p>
+ </a>
+
</div>
<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 5cd230cfa..0547fd9ef 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,21 +1,25 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <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>
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
- <div class="wall-item-location" id="wall-item-location-$id">$location</div>
- </div>
+ <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="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>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+ </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-body" id="wall-item-body-$id" >$body</div>
</div>
+ <div class="wall-item-tools" id="wall-item-tools-$id">
$drop
+ </div>
</div>
<div class="wall-item-wrapper-end"></div>
</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index e3a5fd3e7..008cce059 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -650,15 +650,18 @@ input#dfrn-url {
#profile-in-netdir-yes,
#profile-in-netdir-no,
#hide-friends-yes,
-#hide-friends-no,
+#hide-friends-no {
+ float: left;
+ margin-bottom: 20px;
+}
#settings-normal,
#settings-soapbox,
-#settings-community,
-#settings-freelove {
+#settings-freelove,
+#settings-community {
float: left;
- margin-bottom: 20px;
}
+
#profile-in-dir-yes-label,
#profile-in-dir-no-label,
#profile-in-netdir-yes-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;
@@ -1593,8 +1628,23 @@ 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(245, 245, 255, 0.8);
+ border-bottom: 2px solid #CCC;
+ margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+ display:block;
}
#photo-album-end {
@@ -1602,12 +1652,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;
}
@@ -1935,3 +1995,5 @@ a.mail-list-link {
.tool-link {
cursor: pointer;
}
+
+
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index b9f27ed4a..4d8b5daee 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,23 +1,27 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$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">
- <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="$title" 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>
+ <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">
+ <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="$title" 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>
+ </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-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 14:53:32 +0000