4 files changed, 8 insertions, 11 deletions

diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css
index b2a7dd485..7abbebe71 100644
--- a/themes/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
@@ -318,7 +318,7 @@
 	margin:0 5px; 
 	padding:2px 5px 0 8px;
 }
-.calItemEmpty, td.calDayCellEmpty, td.calDayCellFull {
+SPAN.calItem, td.calDayCellEmpty, td.calDayCellFull {
 	border:1px solid #666;
 }
 
diff --git a/themes/clear/theme.css b/themes/clear/theme.css
index f6d8ca258..a7c64fa51 100644
--- a/themes/clear/theme.css
+++ b/themes/clear/theme.css
@@ -72,7 +72,7 @@ A.navThumb, A.navThumb:hover {
 }
 
 /*calendar elements*/
-.calItem, .calItemEmpty
+.calItem
 {
   border: 1px solid silver;
 }
diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index c3af37818..9fbd8a1fa 100644
--- a/themes/default/template/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
@@ -11,13 +11,11 @@
 		 
 	{else}
 		{foreach from=$bar.items item=item}
-		<span class="calItem{if !isset($item.URL)}Empty{/if}"{if isset($item.NB_IMAGES)} title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if}>
-		{if isset($item.URL)}
-		<a href="{$item.URL}">{$item.LABEL}</a>
+		{if !isset($item.URL)}
+		<span class="calItem">{$item.LABEL}</span>
 		{else}
-		{$item.LABEL}
+		<a class="calItem"{if isset($item.NB_IMAGES)} title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if} href="{$item.URL}">{$item.LABEL}</a>
 		{/if}
-		</span>
 		{/foreach}
 	{/if}
 </div>
diff --git a/themes/default/theme.css b/themes/default/theme.css
index de7f2bafa..1207c46b7 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -140,14 +140,13 @@
 	margin: 5px 5px 0 0;
 }
 
-.calItem, .calItemEmpty {
+.calItem {
 	font-weight: bold;
 	margin: 0 1px;
+	padding: 0 1px;
 	border: 1px solid gray;
 }
 
-.calItem A { text-decoration:none }
-
 .calendarCalBar {
 	margin: 10px;
 }
@@ -664,7 +663,7 @@ IMG.ui-datepicker-trigger {
  */
 
  /* So that non-links are slightly greyed out */
-.content .navigationBar, .calItemEmpty, TD.calDayCellEmpty {
+.content .navigationBar, SPAN.calItem, TD.calDayCellEmpty {
 	color: #b0b0b0;
 }