Merge branch 'master' of git://github.com/friendika/friendika

5 files changed, 73 insertions, 0 deletions

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 77e5bc4bc..61c80702e 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -109,6 +109,22 @@ tinyMCE.init({
 
 	});
 
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0)
+					checkedstr = checkedstr + ',' + $(this).val();
+				else
+					checkedstr = $(this).val();
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
 	function jotGetLink() {
 		reply = prompt("$linkurl");
 		if(reply && reply.length) {
diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl
new file mode 100644
index 000000000..b4ea62b45
--- /dev/null
+++ b/view/photo_drop.tpl
@@ -0,0 +1,4 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 155641463..3bf78346f 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2489,8 +2489,32 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
+.item-select {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
 
+#item-delete-selected {
+	margin-top: 30px;
+}
 
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
 
 #lang-select-icon {
 	cursor: pointer;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d70968a84..c07ef045a 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2518,6 +2518,33 @@ a.mail-list-link {
 }
 
 
+.item-select {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+#item-delete-selected {
+	margin-top: 30px;
+}
+
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+
 #lang-select-icon {
 	cursor: pointer;
 	position: absolute;
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
index b4ea62b45..b10c21093 100644
--- a/view/wall_item_drop.tpl
+++ b/view/wall_item_drop.tpl
@@ -1,4 +1,6 @@
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+	
 	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
 </div>
+<input type="checkbox" class="item-select" name="itemselected[]" value="$id" />
 <div class="wall-item-delete-end"></div>