aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_photos.css49
-rw-r--r--view/theme/redbasic/css/style.css13
-rwxr-xr-xview/tpl/conv_item.tpl2
3 files changed, 2 insertions, 62 deletions
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index b81145cd5..0c4c25bae 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -1,11 +1,3 @@
-
-
-.photo-top-photo, .photo-album-photo {
- padding: 10px;
- max-width: 300px;
-}
-
-
.photos-end {
clear: both;
margin-bottom: 25px;
@@ -30,51 +22,11 @@
clear: both;
}
-.photo-album-image-wrapper {
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- margin-left: 15px;
-}
-.photo-album-image-wrapper .caption {
- display: none;
- width: 100%;
- bottom: 0px;
- padding: 0.5em 0.5em 0px 0.5em;
- margin: 0px;
-}
-.photo-album-image-wrapper a:hover .caption {
- display:block;
-}
-
#photo-album-end {
clear: both;
margin-bottom: 25px;
}
-.photo-top-image-wrapper {
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- margin-left: 15px;
- margin-bottom: 15px;
-}
-.photo-top-album-name {
- width: 100%;
- min-height: 2em;
- bottom: 0px;
- padding: 0px 3px;
- padding-top: 0.5em;
-}
-#photo-top-end {
- clear: both;
-}
-
-#photo-top-links {
- margin-bottom: 30px;
- margin-left: 30px;
-}
-
#photos-upload-newalbum-div {
float: left;
width: 175px;
@@ -83,6 +35,7 @@
#photos-upload-noshare {
margin-bottom: 10px;
}
+
#photos-upload-existing-album-text {
float: left;
width: 175px;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index df95e48b8..bb11ddbb9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -675,10 +675,6 @@ aside li {
margin: auto;
}
-.photo-top-image-wrapper, .photo-album-image-wrapper {
- width: 240px;
-}
-
.photo-top-photo-link, .photo-album-photo-link {
display: block;
width: 100%;
@@ -688,15 +684,6 @@ aside li {
overflow: hidden;
}
-.photo-album-image-wrapper .caption {
- background-color: $acpopup_bgcolour;
- border-bottom: 2px solid $acpopup_bordercolour;
-}
-
-.photo-top-album-name {
- background-color: $acpopup_bgcolour;
-}
-
#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
color: #8888FF;
text-decoration: none;
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index bfa62f1b7..8607b8ee8 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -15,7 +15,7 @@
<div class="wall-item-photo-end" style="clear:both"></div>
</div>
{{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div>
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{$item.title}}{{if $item.plink}}</a>{{/if}}</h3></div>
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">