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

4 files changed, 27 insertions, 11 deletions

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index d2878d17d..6263eef51 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -1,3 +1,4 @@
+<a name="$item.id" />
 <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
@@ -82,7 +83,6 @@
 	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent"></div>
 
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 2705d3e68..e2a972790 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -1,14 +1,17 @@
-<div class="wall-item-outside-wrapper$item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
+<a name="$item.id" />
+<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
 			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
 				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
@@ -88,7 +91,7 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
-</div>
 
 <div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
 
diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl
index 99407fc3e..bd1a57d18 100644
--- a/view/theme/slackr/events_reminder.tpl
+++ b/view/theme/slackr/events_reminder.tpl
@@ -35,5 +35,5 @@
 		});
 	});
 </script>
-<div id="events-reminder"></div>
+<div id="events-reminder" class="$classtoday"></div>
 <br>
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 39da7bb6c..aa4d4b800 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -13,6 +13,10 @@
 	background: none;
 }
 
+.widget {
+/*	box-shadow: 4px 4px 3px 0 #444444; */
+}
+
 .comment-edit-text-empty, .comment-edit-text-full {
 	border: none;
 	border-left: 1px solid #EEE;
@@ -50,14 +54,23 @@ nav #site-location {
 	color: #000000;
 }
 
-.fc {
+#events-reminder {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
 
-.fc:hover {
+#events-reminder.birthday-today, #events-reminder.event-today {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+#events-reminder:hover {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 .fc-event-skin {
@@ -75,7 +88,7 @@ nav #site-location {
 	box-shadow: 4px 4px 3px 0 #444444;
 }
 
-.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
+.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
 	box-shadow: 4px 4px 3px 0 #444444;