Changeset 3201
- Timestamp:
- 03/02/11 11:04:09
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
r3149 r3201 855 855 <xsl:text> </xsl:text> 856 856 <xsl:choose> 857 <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/>< /xsl:when>858 <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/>< /xsl:when>859 <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/>< /xsl:when>860 <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/>< /xsl:when>861 <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/>< /xsl:when>857 <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/><xsl:text> </xsl:text></xsl:when> 858 <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/><xsl:text> </xsl:text></xsl:when> 859 <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/><xsl:text> </xsl:text></xsl:when> 860 <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/><xsl:text> </xsl:text></xsl:when> 861 <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/><xsl:text> </xsl:text></xsl:when> 862 862 </xsl:choose> 863 863 <xsl:text> </xsl:text> … … 869 869 <xsl:choose> 870 870 <xsl:when test="@val='1'"> 871 <xsl:copy-of select="$bwStr-AEEF-TheFirst"/> 871 <xsl:copy-of select="$bwStr-AEEF-TheFirst"/><xsl:text> </xsl:text> 872 872 </xsl:when> 873 873 <xsl:when test="@val='2'"> 874 <xsl:copy-of select="$bwStr-AEEF-TheSecond"/> 874 <xsl:copy-of select="$bwStr-AEEF-TheSecond"/><xsl:text> </xsl:text> 875 875 </xsl:when> 876 876 <xsl:when test="@val='3'"> 877 <xsl:copy-of select="$bwStr-AEEF-TheThird"/> 877 <xsl:copy-of select="$bwStr-AEEF-TheThird"/><xsl:text> </xsl:text> 878 878 </xsl:when> 879 879 <xsl:when test="@val='4'"> 880 <xsl:copy-of select="$bwStr-AEEF-TheFourth"/> 880 <xsl:copy-of select="$bwStr-AEEF-TheFourth"/><xsl:text> </xsl:text> 881 881 </xsl:when> 882 882 <xsl:when test="@val='5'"> 883 <xsl:copy-of select="$bwStr-AEEF-TheFifth"/> 883 <xsl:copy-of select="$bwStr-AEEF-TheFifth"/><xsl:text> </xsl:text> 884 884 </xsl:when> 885 885 <xsl:when test="@val='-1'"> 886 <xsl:copy-of select="$bwStr-AEEF-TheLast"/> 886 <xsl:copy-of select="$bwStr-AEEF-TheLast"/><xsl:text> </xsl:text> 887 887 </xsl:when> 888 888 <!-- don't output "every" --> … … 892 892 </xsl:choose> 893 893 <xsl:for-each select="day"> 894 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if> 894 <xsl:text> </xsl:text> 895 <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> 895 896 <xsl:variable name="dayVal" select="."/> 896 897 <xsl:variable name="dayPos"> … … 901 902 <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/> 902 903 <xsl:if test="position() != last()">, </xsl:if> 904 <xsl:text> </xsl:text> 903 905 </xsl:for-each> 904 906 </xsl:for-each> … … 908 910 <xsl:copy-of select="$bwStr-AEEF-In"/> 909 911 <xsl:for-each select="form/recurrence/bymonth/val"> 910 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> 912 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if> 911 913 <xsl:variable name="monthNum" select="number(.)"/> 912 914 <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/> … … 916 918 917 919 <xsl:if test="form/recurrence/bymonthday"> 920 <xsl:text> </xsl:text> 918 921 <xsl:copy-of select="$bwStr-AEEF-OnThe"/> 922 <xsl:text> </xsl:text> 919 923 <xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/> 920 924 <xsl:copy-of select="$bwStr-AEEF-DayOfTheMonth"/> 925 <xsl:text> </xsl:text> 921 926 </xsl:if> 922 927 923 928 <xsl:if test="form/recurrence/byyearday"> 929 <xsl:text> </xsl:text> 924 930 <xsl:copy-of select="$bwStr-AEEF-OnThe"/> 931 <xsl:text> </xsl:text> 925 932 <xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/> 926 933 <xsl:copy-of select="$bwStr-AEEF-DayOfTheYear"/> 934 <xsl:text> </xsl:text> 927 935 </xsl:if> 928 936 929 937 <xsl:if test="form/recurrence/byweekno"> 938 <xsl:text> </xsl:text> 930 939 <xsl:copy-of select="$bwStr-AEEF-InThe"/> 940 <xsl:text> </xsl:text> 931 941 <xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/> 932 942 <xsl:copy-of select="$bwStr-AEEF-WeekOfTheYear"/> 943 <xsl:text> </xsl:text> 933 944 </xsl:if> 934 945 … … 937 948 <xsl:when test="form/recurrence/count = '-1'"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-Forever"/></xsl:when> 938 949 <xsl:when test="form/recurrence/until"> 939 <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)"/> 950 <xsl:text> </xsl:text> 951 <xsl:copy-of select="$bwStr-AEEF-Until"/> 952 <xsl:text> </xsl:text> 953 <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)"/> 940 954 </xsl:when> 941 955 <xsl:otherwise> 956 <xsl:text> </xsl:text> 942 957 <xsl:value-of select="form/recurrence/count"/> 958 <xsl:text> </xsl:text> 943 959 <xsl:copy-of select="$bwStr-AEEF-Time"/> 944 960 </xsl:otherwise> trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
r3149 r3201 855 855 <xsl:text> </xsl:text> 856 856 <xsl:choose> 857 <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/>< /xsl:when>858 <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/>< /xsl:when>859 <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/>< /xsl:when>860 <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/>< /xsl:when>861 <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/>< /xsl:when>857 <xsl:when test="form/recurrence/freq = 'HOURLY'"><xsl:copy-of select="$bwStr-AEEF-Hour"/><xsl:text> </xsl:text></xsl:when> 858 <xsl:when test="form/recurrence/freq = 'DAILY'"><xsl:copy-of select="$bwStr-AEEF-Day"/><xsl:text> </xsl:text></xsl:when> 859 <xsl:when test="form/recurrence/freq = 'WEEKLY'"><xsl:copy-of select="$bwStr-AEEF-Week"/><xsl:text> </xsl:text></xsl:when> 860 <xsl:when test="form/recurrence/freq = 'MONTHLY'"><xsl:copy-of select="$bwStr-AEEF-Month"/><xsl:text> </xsl:text></xsl:when> 861 <xsl:when test="form/recurrence/freq = 'YEARLY'"><xsl:copy-of select="$bwStr-AEEF-Year"/><xsl:text> </xsl:text></xsl:when> 862 862 </xsl:choose> 863 863 <xsl:text> </xsl:text> … … 869 869 <xsl:choose> 870 870 <xsl:when test="@val='1'"> 871 <xsl:copy-of select="$bwStr-AEEF-TheFirst"/> 871 <xsl:copy-of select="$bwStr-AEEF-TheFirst"/><xsl:text> </xsl:text> 872 872 </xsl:when> 873 873 <xsl:when test="@val='2'"> 874 <xsl:copy-of select="$bwStr-AEEF-TheSecond"/> 874 <xsl:copy-of select="$bwStr-AEEF-TheSecond"/><xsl:text> </xsl:text> 875 875 </xsl:when> 876 876 <xsl:when test="@val='3'"> 877 <xsl:copy-of select="$bwStr-AEEF-TheThird"/> 877 <xsl:copy-of select="$bwStr-AEEF-TheThird"/><xsl:text> </xsl:text> 878 878 </xsl:when> 879 879 <xsl:when test="@val='4'"> 880 <xsl:copy-of select="$bwStr-AEEF-TheFourth"/> 880 <xsl:copy-of select="$bwStr-AEEF-TheFourth"/><xsl:text> </xsl:text> 881 881 </xsl:when> 882 882 <xsl:when test="@val='5'"> 883 <xsl:copy-of select="$bwStr-AEEF-TheFifth"/> 883 <xsl:copy-of select="$bwStr-AEEF-TheFifth"/><xsl:text> </xsl:text> 884 884 </xsl:when> 885 885 <xsl:when test="@val='-1'"> 886 <xsl:copy-of select="$bwStr-AEEF-TheLast"/> 886 <xsl:copy-of select="$bwStr-AEEF-TheLast"/><xsl:text> </xsl:text> 887 887 </xsl:when> 888 888 <!-- don't output "every" --> … … 892 892 </xsl:choose> 893 893 <xsl:for-each select="day"> 894 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> </xsl:if> 894 <xsl:text> </xsl:text> 895 <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> 895 896 <xsl:variable name="dayVal" select="."/> 896 897 <xsl:variable name="dayPos"> … … 901 902 <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/> 902 903 <xsl:if test="position() != last()">, </xsl:if> 904 <xsl:text> </xsl:text> 903 905 </xsl:for-each> 904 906 </xsl:for-each> … … 908 910 <xsl:copy-of select="$bwStr-AEEF-In"/> 909 911 <xsl:for-each select="form/recurrence/bymonth/val"> 910 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/> 912 <xsl:if test="position() != 1 and position() = last()"> <xsl:copy-of select="$bwStr-AEEF-And"/><xsl:text> </xsl:text></xsl:if> 911 913 <xsl:variable name="monthNum" select="number(.)"/> 912 914 <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/> … … 916 918 917 919 <xsl:if test="form/recurrence/bymonthday"> 920 <xsl:text> </xsl:text> 918 921 <xsl:copy-of select="$bwStr-AEEF-OnThe"/> 922 <xsl:text> </xsl:text> 919 923 <xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/> 920 924 <xsl:copy-of select="$bwStr-AEEF-DayOfTheMonth"/> 925 <xsl:text> </xsl:text> 921 926 </xsl:if> 922 927 923 928 <xsl:if test="form/recurrence/byyearday"> 929 <xsl:text> </xsl:text> 924 930 <xsl:copy-of select="$bwStr-AEEF-OnThe"/> 931 <xsl:text> </xsl:text> 925 932 <xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/> 926 933 <xsl:copy-of select="$bwStr-AEEF-DayOfTheYear"/> 934 <xsl:text> </xsl:text> 927 935 </xsl:if> 928 936 929 937 <xsl:if test="form/recurrence/byweekno"> 938 <xsl:text> </xsl:text> 930 939 <xsl:copy-of select="$bwStr-AEEF-InThe"/> 940 <xsl:text> </xsl:text> 931 941 <xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/> 932 942 <xsl:copy-of select="$bwStr-AEEF-WeekOfTheYear"/> 943 <xsl:text> </xsl:text> 933 944 </xsl:if> 934 945 … … 937 948 <xsl:when test="form/recurrence/count = '-1'"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-Forever"/></xsl:when> 938 949 <xsl:when test="form/recurrence/until"> 939 <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)"/> 950 <xsl:text> </xsl:text> 951 <xsl:copy-of select="$bwStr-AEEF-Until"/> 952 <xsl:text> </xsl:text> 953 <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)"/> 940 954 </xsl:when> 941 955 <xsl:otherwise> 956 <xsl:text> </xsl:text> 942 957 <xsl:value-of select="form/recurrence/count"/> 958 <xsl:text> </xsl:text> 943 959 <xsl:copy-of select="$bwStr-AEEF-Time"/> 944 960 </xsl:otherwise>
