[Fmsystem-commits] [10722] Calendar view when no location is selected

[Torstein]

Revision: 10722
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10722
Author:   vator
Date:     2013-01-29 10:06:12 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
Calendar view when no location is selected

Modified Paths:
--------------
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    trunk/controller/templates/base/calendar/view_calendar_year.xsl

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2013-01-29 09:51:33 UTC (rev 10721)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2013-01-29 10:06:12 UTC (rev 10722)
@@ -1,15 +1,7 @@
-
-<!-- $Id$ -->
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <xsl:variable name="date_format">
-               <xsl:value-of select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')" />
-       </xsl:variable>
-       <xsl:variable name="month_str">month
-               <xsl:value-of select="current_month_nr"/> capitalized
-       </xsl:variable>
-       <xsl:variable name="session_url">&amp;
-               <xsl:value-of select="php:function('get_phpgw_session_url')" />
-       </xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')" 
/></xsl:variable>
+<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/> 
capitalized</xsl:variable>
+<xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
        <script>
                <xsl:text>

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2013-01-29 09:51:33 UTC (rev 10721)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2013-01-29 10:06:12 UTC (rev 10722)
@@ -1,8 +1,5 @@
-<!-- $Id$ -->
 <xsl:template match="data"  xmlns:php="http://php.net/xsl";>
-       <xsl:variable name="session_url">&amp;
-               <xsl:value-of select="php:function('get_phpgw_session_url')" />
-       </xsl:variable>
+<xsl:variable name="session_url">&amp;<xsl:value-of 
select="php:function('get_phpgw_session_url')" /></xsl:variable>
 
        <script>
                <xsl:text>
@@ -171,10 +168,8 @@
                                                                                
<xsl:value-of select="$session_url"/>
                                                                        
</xsl:attribute>
 
-                                                                       
<xsl:variable name="month_str">short_month
-                                                                               
<xsl:number/> capitalized
-                                                                       
</xsl:variable>
-                                                                       
<xsl:value-of select="php:function('lang', $month_str)" />
+                                                                       
<xsl:variable name="month_str">short_month <xsl:number/> 
capitalized</xsl:variable>
+                                                               <xsl:value-of 
select="php:function('lang', $month_str)" />
                                                                </a>
                                                        </th>
                                                </xsl:for-each>