Author: michiel Date: 2010-06-08 13:52:30 +0200 (Tue, 08 Jun 2010) New Revision: 42455
Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/axis.tagx mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/css.tagx mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/items.tagx mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/localeSelector.tagx mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/month.tagx mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/monthsOverview.tagx Log: added some descriptions Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/axis.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/axis.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/axis.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -1,15 +1,13 @@ <jsp:root - xmlns:c="http://java.sun.com/jsp/jstl/core"; + xmlns:c="http://java.sun.com/jsp/jstl/core"; xmlns:jsp="http://java.sun.com/JSP/Page"; xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; version="2.0" > - <!-- - Iterators an 'axis' of a month. - That is either all days of certain week of the month, or all certain weekdays of the month. - - --> - <jsp:directive.tag import="java.util.*" /> + <jsp:directive.tag import="java.util.*" + description="Iterators an 'axis' of a month. + That is either all days of certain week of the month, or all certain weekdays of the month." + /> <jsp:directive.attribute name="name" /><!-- either week or day --> <jsp:directive.attribute name="date" type="java.util.Date" /> @@ -26,16 +24,16 @@ <jsp:directive.variable name-given="formonthname" /> <jsp:directive.variable name-given="whichmonth" /> - <jsp:scriptlet xmlns:jsp="http://java.sun.com/JSP/Page";> - - Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), - (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); + <jsp:scriptlet xmlns:jsp="http://java.sun.com/JSP/Page";> + + Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), + (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); if (date != null) { cal.setTime(date); month = cal.get(Calendar.MONTH) + 1; year = cal.get(Calendar.YEAR); - } - + } + </jsp:scriptlet> <mm:locale language="en" country="US"> <mm:time referid="date" format="MMMM" id="formonthname" write="false" /> @@ -88,7 +86,7 @@ cal.set(Calendar.WEEK_OF_MONTH, week); cal.set(Calendar.DAY_OF_WEEK, indexOffset + index); </jsp:scriptlet> - <mm:context> + <mm:context> <mm:import id="time"><jsp:expression>cal.getTime().getTime() / 1000</jsp:expression></mm:import> <mm:time id="day" time="${time}" write="false" vartype="date" /> <mm:time id="noon" time="${time} noon" write="false" vartype="date" /> Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/css.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/css.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/css.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -4,6 +4,9 @@ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; version="2.0" > + <jsp:directive.tag import="java.util.*" + description="Produces the needed CSS" + /> <jsp:directive.attribute name="weekend" /> <jsp:directive.attribute name="months" /> <mm:cloud method="asis"> @@ -23,7 +26,7 @@ } </mm:listnodes> - + </mm:cloud> <c:choose> <c:when test="${empty weekend}"> @@ -36,7 +39,7 @@ </c:when> <c:otherwise> .mm_calendar td.Saturday, .mm_calendar td.Sunday, - .mm_calendar th.Saturday, .mm_calendar th.Sunday { + .mm_calendar th.Saturday, .mm_calendar th.Sunday { background-color: ${weekend} !important; } </c:otherwise> Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/items.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/items.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/items.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -1,10 +1,12 @@ <jsp:root - xmlns:c="http://java.sun.com/jsp/jstl/core"; + xmlns:c="http://java.sun.com/jsp/jstl/core"; xmlns:jsp="http://java.sun.com/JSP/Page"; xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; version="2.0" > - <jsp:directive.tag import="java.util.*" /> + <jsp:directive.tag import="java.util.*" + descripion="Lists all calendar_items between two dates" + /> <jsp:directive.attribute name="day" type="java.util.Date" required="true" /> <jsp:directive.attribute name="dayend" type="java.util.Date" /> <jsp:directive.attribute name="stop" /><!-- if true, then the entry will also be shown if the start time is on a previous day, but the stop time is on this day or later.--> @@ -14,8 +16,8 @@ <jsp:scriptlet> if (dayend == null) { - Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), - (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); + Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), + (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); cal.setTime(day); cal.add(Calendar.DAY_OF_YEAR, 1); dayend = cal.getTime(); Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/localeSelector.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/localeSelector.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/localeSelector.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -1,22 +1,24 @@ <jsp:root - xmlns:c="http://java.sun.com/jsp/jstl/core"; + xmlns:c="http://java.sun.com/jsp/jstl/core"; xmlns:fn="http://java.sun.com/jsp/jstl/functions"; xmlns:jsp="http://java.sun.com/JSP/Page"; xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; version="2.0" > - <jsp:directive.tag import="java.util.*" /> + <jsp:directive.tag import="java.util.*" + description="Simple tool to let the user select a locale" + /> <jsp:directive.attribute name="context" type="java.util.Map" /> <jsp:directive.attribute name="language" /> <jsp:directive.attribute name="languages" /> <jsp:directive.attribute name="timezones" /> <jsp:directive.attribute name="timezone" /> - + <div class="mm_calendar" id="localeSelector"> <form name="localeform" method="get"> <mm:hiddens context="${context}" except="language,timezone" /> <mm:import id="languages" vartype="list">${empty languages ? 'en-US,en-GB,zh,ja,de-DE,fr-FR,fr-CA,it,es,pt-PT,pt-BR,nl-NL,nl-BE,da,cs,fi,el,sr,eo' : languages}</mm:import> - + <c:if test="${fn:length(languages) gt 1}"> <select onchange="document.forms['localeform'].submit();" name="language"> <mm:option compare="${language}" value="client">--</mm:option> @@ -41,7 +43,7 @@ </select> </c:if> <mm:time time="now" format=":FULL.FULL" /> - + </form> - </div> + </div> </jsp:root> \ No newline at end of file Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/month.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/month.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/month.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -1,5 +1,5 @@ <jsp:root - xmlns:c="http://java.sun.com/jsp/jstl/core"; + xmlns:c="http://java.sun.com/jsp/jstl/core"; xmlns:jsp="http://java.sun.com/JSP/Page"; xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; xmlns:mm-cal="http://www.mmbase.org/tags/mm/calendar"; @@ -7,15 +7,18 @@ > <!-- This can be useful during development - xmlns:mm-cal="urn:jsptagdir:/WEB-INF/tags/mm/calendar" + xmlns:mm-cal="urn:jsptagdir:/WEB-INF/tags/mm/calendar" --> - <jsp:directive.tag import="java.util.*" /> + <jsp:directive.tag import="java.util.*" + description="Shows one month" + /> <jsp:directive.attribute name="date" type="java.util.Date" /> <jsp:directive.attribute name="year" type="java.lang.Integer" /> <jsp:directive.attribute name="month" type="java.lang.Integer" /> - <jsp:directive.attribute name="layout" type="java.lang.String" /> <!-- vertical/horizontal --> + <jsp:directive.attribute name="layout" type="java.lang.String" + description="vertical/horizontal" /> <jsp:directive.variable name-given="day" /> <jsp:directive.variable name-given="noon" /> @@ -23,16 +26,16 @@ <jsp:directive.variable name-given="loop" /> <jsp:directive.variable name-given="dayofweek" /> - <jsp:scriptlet xmlns:jsp="http://java.sun.com/JSP/Page";> - - Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), - (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); + <jsp:scriptlet xmlns:jsp="http://java.sun.com/JSP/Page";> + + Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), + (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); if (date != null) { cal.setTime(date); month = cal.get(Calendar.MONTH) + 1; year = cal.get(Calendar.YEAR); - } - + } + </jsp:scriptlet> <mm:locale language="en" country="US"><mm:time id="month" format="MMMM" time="${date}" write="false" /></mm:locale> Modified: mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/monthsOverview.tagx =================================================================== --- mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/monthsOverview.tagx 2010-06-08 11:19:01 UTC (rev 42454) +++ mmbase/trunk/contributions/calendar/src/main/resources/META-INF/tags/mm/calendar/monthsOverview.tagx 2010-06-08 11:52:30 UTC (rev 42455) @@ -6,7 +6,7 @@ version="2.0" > <!-- This can be useful during development - xmlns:mm-cal="urn:jsptagdir:/WEB-INF/tags/mm/calendar" + xmlns:mm-cal="urn:jsptagdir:/WEB-INF/tags/mm/calendar" --> <jsp:directive.tag import="java.util.*" /> @@ -14,14 +14,14 @@ <jsp:directive.attribute name="context" type="java.util.Map" /> <jsp:directive.attribute name="referids" /> - <jsp:directive.attribute name="offset" /><!-- first month to show (0 = current month, default = -1) --> + <jsp:directive.attribute name="offset" description="first month to show (0 = current month, default = -1)" /> - <jsp:directive.attribute name="buttons" /><!-- directory containing images for buttons --> + <jsp:directive.attribute name="buttons" description="directory containing images for buttons" /> - <jsp:directive.attribute name="cols" required="true" /><!-- number of columns to show --> - <jsp:directive.attribute name="rows" required="true" /><!-- number of rows to show --> + <jsp:directive.attribute name="cols" required="true" description="number of columns to show" /> + <jsp:directive.attribute name="rows" required="true" description="number of rows to show" /> <!-- total number of months shown is cols x rows --> - + <jsp:directive.attribute name="layout" /> <jsp:directive.attribute name="weeklayout" /> <!-- not yet supported --> @@ -34,19 +34,19 @@ <mm:import id="o" externid="offset">${empty offset ? '-1' : offset}</mm:import> <jsp:scriptlet> - Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), - (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); + Calendar cal = Calendar.getInstance((TimeZone) request.getAttribute("org.mmbase.timezone"), + (Locale) request.getAttribute("javax.servlet.jsp.jstl.fmt.locale.request")); </jsp:scriptlet> <table class="mm_calendar monthsOverview"> <c:choose> <!-- HORIZONTAL --> - + <c:when test="${empty layout or layout eq 'horizontal'}"> <!-- produced columns when 'horizontal': --> <col class="weeknr month" /> <!-- 0 - 5 --> - + <c:forEach begin="1" end="${cols}"> <!-- one week is presented by 9 colums, monthname, the week number followed by one column per day --> <col class="monthname" /> @@ -60,7 +60,7 @@ <mm:import id="wday"><jsp:expression>cal.getTime().getTime() / 1000</jsp:expression></mm:import> <mm:locale language="en" country="US"><mm:time referid="wday" format="EEEEE" id="weekday" write="false" /></mm:locale> <col class="${weekday}" /> - </mm:context> + </mm:context> <jsp:scriptlet> } </jsp:scriptlet> @@ -108,7 +108,7 @@ <mm:import id="wday"><jsp:expression>cal.getTime().getTime() / 1000</jsp:expression></mm:import> <mm:locale language="en" country="US"><mm:time referid="wday" format="EEEEE" id="weekday" write="false" /></mm:locale> <th class="${weekday}"><mm:time referid="wday" format="E" /></th> - </mm:context> + </mm:context> <jsp:scriptlet> } </jsp:scriptlet> @@ -149,7 +149,7 @@ <c:forEach begin="${firstWeek}" end="${lastWeek}" var="week"> <tr> <td class="weeknr month">${week}</td> - <c:forEach begin="0" end="${cols - 1}" var="c"> + <c:forEach begin="0" end="${cols - 1}" var="c"> <mm:context> <mm:import id="m">${cols * r + c + o}</mm:import> <mm:time time="tomonth ${m ge 0 ? '+' : ''} ${m} month" id="month" write="false" vartype="date" /> @@ -178,7 +178,7 @@ <!--- VERTICAL --> <c:otherwise> - + <c:forEach begin="1" end="${cols}"> <!-- one month is presented a maximum of 6 collums, one for each week. --> <c:forEach begin="0" end="5" var="week"> _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
