diff --git a/mod/photos.php b/mod/photos.php
index 1ec16898b..0e9055d05 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1640,10 +1640,15 @@ function photos_content(&$a) {
$profile_link = $profile_url;
- $drop = '';
-
- if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()))
- $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+ $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
+ $drop = array(
+ 'dropping' => $dropping,
+ 'pagedrop' => false,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
if($a->theme['template_engine'] === 'internal') {
diff --git a/view/templates/photo_drop.tpl b/view/templates/photo_drop.tpl
deleted file mode 100644
index ed500fd0a..000000000
--- a/view/templates/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- * AUTOMATICALLY GENERATED TEMPLATE
- * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-
diff --git a/view/templates/photo_item.tpl b/view/templates/photo_item.tpl
index 7d6ac96ee..d1ed78b7e 100644
--- a/view/templates/photo_item.tpl
+++ b/view/templates/photo_item.tpl
@@ -17,7 +17,14 @@
{{$title}}
{{$body}}
- {{$drop}}
+
+ {{if $drop.dropping }}
+
+
+ {{/if}}
+
{{$comment}}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 22d3f13b0..8436b56d5 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -486,6 +486,7 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
+
z-index: 110;
color: #ffffff;
}
@@ -815,6 +816,7 @@ aside #profiles-menu {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
+
}
#contact-block .contact-block-h4 {
float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
}
.widget h3 {
padding: 0px;
@@ -1160,6 +1163,9 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.wall-item-comment-wrapper.photo {
+ margin: 1em 2em 1em 0px;
+}
.threaded .wall-item-comment-wrapper {
margin-left: 0px;
}
@@ -1174,6 +1180,7 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 24ce51c65..19c517006 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -486,6 +486,7 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
+
z-index: 110;
color: #ffffff;
}
@@ -815,6 +816,7 @@ aside #profiles-menu {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
+
}
#contact-block .contact-block-h4 {
float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
}
.widget h3 {
padding: 0px;
@@ -1160,6 +1163,9 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.wall-item-comment-wrapper.photo {
+ margin: 1em 2em 1em 0px;
+}
.threaded .wall-item-comment-wrapper {
margin-left: 0px;
}
@@ -1174,6 +1180,7 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 7c002b112..9b191dab9 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -486,6 +486,7 @@ header {
margin: 0px;
padding: 0px;
/*width: 100%; height: 12px; */
+
z-index: 110;
color: #ffffff;
}
@@ -815,6 +816,7 @@ aside #profiles-menu {
overflow: auto;
height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
+
}
#contact-block .contact-block-h4 {
float: left;
@@ -896,6 +898,7 @@ aside #profiles-menu {
margin-bottom: 2em;
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+
}
.widget h3 {
padding: 0px;
@@ -1160,6 +1163,9 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.wall-item-comment-wrapper.photo {
+ margin: 1em 2em 1em 0px;
+}
.threaded .wall-item-comment-wrapper {
margin-left: 0px;
}
@@ -1174,6 +1180,7 @@ section {
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 96019e092..60f70d421 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -586,6 +586,10 @@ section {
color: @CommentBoxFullColor;
border: 1px solid @CommentBoxFullBorderColor;
}
+
+ &.photo {
+ margin: 1em 2em 1em 0px;
+ }
}
.threaded .wall-item-comment-wrapper { margin-left: 0px; }
diff --git a/view/theme/quattro/templates/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl
index f951fc97a..8b1378917 100644
--- a/view/theme/quattro/templates/birthdays_reminder.tpl
+++ b/view/theme/quattro/templates/birthdays_reminder.tpl
@@ -1,6 +1 @@
-{{*
- * AUTOMATICALLY GENERATED TEMPLATE
- * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
diff --git a/view/theme/quattro/templates/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl
index eca1f14f4..d3d5c4632 100644
--- a/view/theme/quattro/templates/comment_item.tpl
+++ b/view/theme/quattro/templates/comment_item.tpl
@@ -1,8 +1,3 @@
-{{*
- * AUTOMATICALLY GENERATED TEMPLATE
- * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}