r1337 - xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar

[Jeremi Joslin]

Author: jeremi
Date: 2006-09-21 12:07:29 +0200 (Thu, 21 Sep 2006)
New Revision: 1337

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java
Log:
Add one div by event
Add a class when a day has an event

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java	2006-09-20 14:52:25 UTC (rev 1336)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java	2006-09-21 10:07:29 UTC (rev 1337)
@@ -167,6 +167,7 @@
             if ((idate>= isdate)&&(idate<=iedate)) {
                     StringBuffer message = new StringBuffer();
                     String user = event.getUser();
+                    message.append("<div class=\"event\">");
                     if ((user!=null)&&(!user.equals("")))
                      message.append(context.getWiki().getLocalUserName(event.getUser(), context));
                     String desc = event.getDescription();
@@ -174,6 +175,7 @@
                       message.append(": ");
                     message.append(desc);
                     message.append("<br />");
+                    message.append("</div>");
                     result.append(message);
                 }
         }

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java	2006-09-20 14:52:25 UTC (rev 1336)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java	2006-09-21 10:07:29 UTC (rev 1337)
@@ -269,19 +269,24 @@
         if (url!=null)
         {
             output.append("<div class=\"wiki-calendar-daytitle\">");
+            if ( content!=null && content.length() > 0)
+                output.append("<div class=\"wiki-calendar-daytitle-hasevent\">");
             output.append("<a href=\""+url+"\">");
             output.append(cal.get(Calendar.DAY_OF_MONTH));
-            if ( content!=null ) {
-                output.append( "<br />");
+            if ( content!=null  && content.length() > 0) {
+                output.append( "<br />");                
                 output.append( content );
+                output.append("</div>");
             }
             output.append("</a></div>");
         }
         else
         {
             output.append("<div class=\"wiki-calendar-daytitle\">");
+            if ( content!=null  && content.length() > 0)
+                output.append("<div class=\"wiki-calendar-daytitle-hasevent\">");
             output.append(cal.get(Calendar.DAY_OF_MONTH));
-            if ( content!=null ) {
+            if ( content!=null  && content.length() > 0) {
                 output.append( "<br />");
                 output.append( content );
             }