[Bedework-commit] bedework r3201 -
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme
trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme
svnadmin at bedework.org
svnadmin at bedework.org
Wed Mar 2 11:04:10 EST 2011
Author: johnsa
Date: 2011-03-02 11:04:09 -0500 (Wed, 02 Mar 2011)
New Revision: 3201
Modified:
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
Log:
user client: add white space to recurring event text in event form
Modified: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
===================================================================
--- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl 2011-03-01 19:59:33 UTC (rev 3200)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl 2011-03-02 16:04:09 UTC (rev 3201)
@@ -854,11 +854,11 @@
</xsl:choose>
<xsl:text> </xsl:text>
<xsl:choose>
- <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/><xsl:text> </xsl:text></xsl:when>
</xsl:choose>
<xsl:text> </xsl:text>
@@ -868,22 +868,22 @@
<xsl:copy-of select="$bwStr-AEEF-On"/>
<xsl:choose>
<xsl:when test="@val='1'">
- <xsl:copy-of select="$bwStr-AEEF-TheFirst"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFirst"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='2'">
- <xsl:copy-of select="$bwStr-AEEF-TheSecond"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheSecond"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='3'">
- <xsl:copy-of select="$bwStr-AEEF-TheThird"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheThird"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='4'">
- <xsl:copy-of select="$bwStr-AEEF-TheFourth"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFourth"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='5'">
- <xsl:copy-of select="$bwStr-AEEF-TheFifth"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFifth"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='-1'">
- <xsl:copy-of select="$bwStr-AEEF-TheLast"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheLast"/><xsl:text> </xsl:text>
</xsl:when>
<!-- don't output "every" -->
<!--<xsl:otherwise>
@@ -891,7 +891,8 @@
</xsl:otherwise>-->
</xsl:choose>
<xsl:for-each select="day">
- <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if>
+ <xsl:text> </xsl:text>
+ <xsl:if test="position() != 1 and position() = last()"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if>
<xsl:variable name="dayVal" select="."/>
<xsl:variable name="dayPos">
<xsl:for-each select="/bedework/recurdayvals/val">
@@ -900,6 +901,7 @@
</xsl:variable>
<xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/>
<xsl:if test="position() != last()">, </xsl:if>
+ <xsl:text> </xsl:text>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
@@ -907,7 +909,7 @@
<xsl:if test="form/recurrence/bymonth">
<xsl:copy-of select="$bwStr-AEEF-In"/>
<xsl:for-each select="form/recurrence/bymonth/val">
- <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if>
+ <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if>
<xsl:variable name="monthNum" select="number(.)"/>
<xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/>
<xsl:if test="position() != last()">, </xsl:if>
@@ -915,31 +917,45 @@
</xsl:if>
<xsl:if test="form/recurrence/bymonthday">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-OnThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-DayOfTheMonth"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="form/recurrence/byyearday">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-OnThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-DayOfTheYear"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="form/recurrence/byweekno">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-InThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-WeekOfTheYear"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:copy-of select="$bwStr-AEEF-Repeating"/>
<xsl:choose>
<xsl:when test="form/recurrence/count = '-1'"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-Forever"/></xsl:when>
<xsl:when test="form/recurrence/until">
- <xsl:copy-of select="$bwStr-AEEF-Until"/> <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/>
+ <xsl:text> </xsl:text>
+ <xsl:copy-of select="$bwStr-AEEF-Until"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/>
</xsl:when>
<xsl:otherwise>
+ <xsl:text> </xsl:text>
<xsl:value-of select="form/recurrence/count"/>
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-Time"/>
</xsl:otherwise>
</xsl:choose>
Modified: trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl 2011-03-01 19:59:33 UTC (rev 3200)
+++ trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl 2011-03-02 16:04:09 UTC (rev 3201)
@@ -854,11 +854,11 @@
</xsl:choose>
<xsl:text> </xsl:text>
<xsl:choose>
- <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/></xsl:when>
- <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/><xsl:text> </xsl:text></xsl:when>
+ <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/><xsl:text> </xsl:text></xsl:when>
</xsl:choose>
<xsl:text> </xsl:text>
@@ -868,22 +868,22 @@
<xsl:copy-of select="$bwStr-AEEF-On"/>
<xsl:choose>
<xsl:when test="@val='1'">
- <xsl:copy-of select="$bwStr-AEEF-TheFirst"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFirst"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='2'">
- <xsl:copy-of select="$bwStr-AEEF-TheSecond"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheSecond"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='3'">
- <xsl:copy-of select="$bwStr-AEEF-TheThird"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheThird"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='4'">
- <xsl:copy-of select="$bwStr-AEEF-TheFourth"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFourth"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='5'">
- <xsl:copy-of select="$bwStr-AEEF-TheFifth"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheFifth"/><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="@val='-1'">
- <xsl:copy-of select="$bwStr-AEEF-TheLast"/>
+ <xsl:copy-of select="$bwStr-AEEF-TheLast"/><xsl:text> </xsl:text>
</xsl:when>
<!-- don't output "every" -->
<!--<xsl:otherwise>
@@ -891,7 +891,8 @@
</xsl:otherwise>-->
</xsl:choose>
<xsl:for-each select="day">
- <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if>
+ <xsl:text> </xsl:text>
+ <xsl:if test="position() != 1 and position() = last()"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if>
<xsl:variable name="dayVal" select="."/>
<xsl:variable name="dayPos">
<xsl:for-each select="/bedework/recurdayvals/val">
@@ -900,6 +901,7 @@
</xsl:variable>
<xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/>
<xsl:if test="position() != last()">, </xsl:if>
+ <xsl:text> </xsl:text>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
@@ -907,7 +909,7 @@
<xsl:if test="form/recurrence/bymonth">
<xsl:copy-of select="$bwStr-AEEF-In"/>
<xsl:for-each select="form/recurrence/bymonth/val">
- <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if>
+ <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if>
<xsl:variable name="monthNum" select="number(.)"/>
<xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/>
<xsl:if test="position() != last()">, </xsl:if>
@@ -915,31 +917,45 @@
</xsl:if>
<xsl:if test="form/recurrence/bymonthday">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-OnThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-DayOfTheMonth"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="form/recurrence/byyearday">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-OnThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-DayOfTheYear"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="form/recurrence/byweekno">
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-InThe"/>
+ <xsl:text> </xsl:text>
<xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/>
<xsl:copy-of select="$bwStr-AEEF-WeekOfTheYear"/>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:copy-of select="$bwStr-AEEF-Repeating"/>
<xsl:choose>
<xsl:when test="form/recurrence/count = '-1'"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-Forever"/></xsl:when>
<xsl:when test="form/recurrence/until">
- <xsl:copy-of select="$bwStr-AEEF-Until"/> <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/>
+ <xsl:text> </xsl:text>
+ <xsl:copy-of select="$bwStr-AEEF-Until"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/>
</xsl:when>
<xsl:otherwise>
+ <xsl:text> </xsl:text>
<xsl:value-of select="form/recurrence/count"/>
+ <xsl:text> </xsl:text>
<xsl:copy-of select="$bwStr-AEEF-Time"/>
</xsl:otherwise>
</xsl:choose>
More information about the Bedework-commit
mailing list