[Webical-commits] SF.net SVN: webical: [644] trunk/webical-core/src/main

[<mat...@us...>]

Revision: 644
          http://webical.svn.sourceforge.net/webical/?rev=644&view=rev
Author:   mattijshoitink
Date:     2008-01-10 07:42:51 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
updated weekviewpanel (again :S )

Modified Paths:
--------------
    trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java
    trunk/webical-core/src/main/resources/org/webical/web/component/calendar/WeekViewPanel.html

Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java	2008-01-10 14:38:02 UTC (rev 643)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java	2008-01-10 15:42:51 UTC (rev 644)
@@ -28,9 +28,11 @@
 import java.util.GregorianCalendar;
 
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
 import org.webical.util.CalendarUtils;
 import org.webical.web.action.IAction;
 import org.webical.web.app.WebicalSession;
@@ -46,14 +48,10 @@
 
 	// Markup ID's
 	private static final String DAY_HEADING_REPEATER_MARKUP_ID = "dayHeadingRepeater";
-	private static final String WEEK_HEADING_HEAD_LABEL_MARKUP_ID = "weekHeadingHeadLabel";
-	private static final String WEEK_HEADING_LABEL_BODY_MARKUP_ID = "weekHeadingBodyLabel";
+	private static final String WEEK_HEADING_HEAD_CONTAINER_MARKUP_ID = "weekHeadingHeadContainer";
+	private static final String WEEK_HEADING_BODY_LABEL_MARKUP_ID = "weekHeadingBodyContainer";
 	private static final String WEEK_COLUMN_REPEATER_MARKUP_ID = "weekColumnRepeater";
 
-	private static final String WEEK_HEADING_RESOURCE_KEY = "weekHeadingStart";
-	private static final String XDAYS_HEADING_START_RESOURCE_KEY = "xdaysHeadingStart";
-	private static final String XDAYS_HEADING_END_RESOURCE_KEY = "xdaysHeadingEnd";
-
 	/**
 	 * The identifier for the period this panel covers
 	 */
@@ -86,8 +84,9 @@
 
 	// Panel components
 	private WeekColumnRepeater weekColumnRepeater;
-	private String weekHeadingHeadText, weekHeadingBodyText;
-	private Label weekHeadingHeadLabel, weekHeadingBodyLabel;
+	private WebMarkupContainer weekHeadingHeadContainer;
+	private Label weekHeadingBodyLabel;
+	private String weekHeadingBodyText;
 
 	/**
 	 * Constructor.
@@ -181,15 +180,16 @@
 	 * and every time the page is loaded.
 	 */
 	private void renderModelDependentLabels() {
-		// Render the label for the week heading with the (updated) weekHeadingText
-		weekHeadingHeadLabel = new Label(WEEK_HEADING_HEAD_LABEL_MARKUP_ID);
-		weekHeadingBodyLabel = new Label(WEEK_HEADING_LABEL_BODY_MARKUP_ID);
+		
+		weekHeadingHeadContainer = new WebMarkupContainer(WEEK_HEADING_HEAD_CONTAINER_MARKUP_ID);
+		weekHeadingBodyLabel = new Label(WEEK_HEADING_BODY_LABEL_MARKUP_ID, new Model(weekHeadingBodyText));
+		//weekHeadingBodyLabel = new Label(WEEK_HEADING_LABEL_BODY_MARKUP_ID, weekHeadingBodyText);
 		if(!weekView) {
 			// User is not viewing a complete week, weeknumber isn't necessary
-			weekHeadingHeadLabel.setVisible(false);
+			weekHeadingHeadContainer.setVisible(false);
 			weekHeadingBodyLabel.setVisible(false);
 		}
-		addOrReplace(weekHeadingHeadLabel);
+		addOrReplace(weekHeadingHeadContainer);
 		addOrReplace(weekHeadingBodyLabel);
 	}
 
@@ -206,6 +206,7 @@
 			weekHeadingBodyText = String.valueOf(currentDate.get(Calendar.WEEK_OF_YEAR));
 		} else {
 			startDate.setTime(this.currentDate.getTime().getTime());
+			weekHeadingBodyText = "";
 		}
 
 		// Calculate the end date

Modified: trunk/webical-core/src/main/resources/org/webical/web/component/calendar/WeekViewPanel.html
===================================================================
--- trunk/webical-core/src/main/resources/org/webical/web/component/calendar/WeekViewPanel.html	2008-01-10 14:38:02 UTC (rev 643)
+++ trunk/webical-core/src/main/resources/org/webical/web/component/calendar/WeekViewPanel.html	2008-01-10 15:42:51 UTC (rev 644)
@@ -7,13 +7,13 @@
 					<table id="weekView" cellspacing="0">
 						<thead>
 							<tr>
-								<th class="first" wicket:id="weekHeadingHeadLabel">&nbsp;</th>
+								<th class="first" wicket:id="weekHeadingHeadContainer">&nbsp;</th>
 								<th wicket:id="dayHeadingRepeater"></th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr class="weekRow">
-								<td rowspan="2" class="weekHeader" wicket:id="weekHeadingBodyLabel">&nbsp;</td>
+								<td rowspan="2" class="weekHeader" wicket:id="weekHeadingBodyContainer">&nbsp;</td>
 								<td wicket:id="weekColumnRepeater" class="weekColumn"></td>
 							</tr>
 						</tbody>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.