[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9365]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9365] |
|
Date: |
Fri, 11 May 2012 06:39:51 +0000 |
Revision: 9365
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9365
Author: vator
Date: 2012-05-11 06:39:49 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/component/class.month_calendar.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 14:21:12 UTC
(rev 9364)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-05-11 06:39:49 UTC
(rev 9365)
@@ -136,7 +136,6 @@
'heading_array' =>
month_calendar::get_heading_array($year, $month),
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'current_month' =>
month_calendar::get_month_name($month-1),
'current_year' => $year,
'current_month_nr' => $month
);
@@ -152,7 +151,7 @@
$location_code = phpgw::get_var('location_code');
$year = phpgw::get_var('year');
- // Array that should conatain control and calendar
objects that will be sent to view
+ // Array that should conatain control and calendar
objects that will be sent to view
$controls_calendar_array = array();
if(empty($year)){
Modified: trunk/controller/inc/component/class.month_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.month_calendar.inc.php 2012-05-10
14:21:12 UTC (rev 9364)
+++ trunk/controller/inc/component/class.month_calendar.inc.php 2012-05-11
06:39:49 UTC (rev 9365)
@@ -110,11 +110,4 @@
return $to_date_ts;
}
-
- public static function get_month_name($month){
-
- $month_array = array("Januar", "Februar", "Mars", "April",
"Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
-
- return $month_array[$month];
- }
}
\ No newline at end of file
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2012-05-10 14:21:12 UTC (rev
9364)
+++ trunk/controller/setup/phpgw_no.lang 2012-05-11 06:39:49 UTC (rev
9365)
@@ -46,6 +46,18 @@
month 10 capitalized controller no Oktober
month 11 capitalized controller no November
month 12 capitalized controller no Desember
+short_month 1 capitalized controller no Jan
+short_month 2 capitalized controller no Feb
+short_month 3 capitalized controller no Mar
+short_month 4 capitalized controller no Apr
+short_month 5 capitalized controller no Mai
+short_month 6 capitalized controller no Jun
+short_month 7 capitalized controller no Jul
+short_month 8 capitalized controller no Aug
+short_month 9 capitalized controller no Sep
+short_month 10 capitalized controller no Okt
+short_month 11 capitalized controller no Nov
+short_month 12 capitalized controller no Des
monthly controller no Månedlig
month controller no Måned
no part of town controller no Bydel ikke valgt
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 14:21:12 UTC (rev 9364)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-11 06:39:49 UTC (rev 9365)
@@ -46,14 +46,14 @@
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
<xsl:text>&year=</xsl:text>
- <xsl:value-of select="year"/>
+ <xsl:value-of select="current_year"/>
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of select="$location_code"/>
+ <xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
Årsoversikt
</a>
- <div id="monthNav">
- <a id="showPrevMonth">
+ <div id="calNav">
+ <a class="showPrev month">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
<xsl:text>&year=</xsl:text>
@@ -66,7 +66,7 @@
<xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr - 1"/> capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
</a>
- <a id="showNextMonth">
+ <a class="showNext">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
<xsl:text>&year=</xsl:text>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 14:21:12 UTC (rev 9364)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-11 06:39:49 UTC (rev 9365)
@@ -42,6 +42,31 @@
<xsl:call-template name="icon_color_map" />
+ <div id="calNav">
+ <a class="showPrev">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year - 1"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="current_location/location_code"/>
+ </xsl:attribute>
+
+ <xsl:value-of select="current_year -
1"/>
+ </a>
+ <a class="showNext">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year + 1"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="current_location/location_code"/>
+ </xsl:attribute>
+
+ <xsl:value-of select="current_year +
1"/>
+ </a>
+ </div>
+
</div>
<div id="cal_wrp">
@@ -62,7 +87,9 @@
<xsl:text>&month=</xsl:text>
<xsl:number/>
</xsl:attribute>
- <xsl:value-of
select="."/>
+
+ <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>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-05-10 14:21:12 UTC
(rev 9364)
+++ trunk/controller/templates/base/css/base.css 2012-05-11 06:39:49 UTC
(rev 9365)
@@ -1003,22 +1003,25 @@
font-size: 14px;
float:left;
}
-#showNextMonth{
+#calNav {
+ clear: both;
+ font-size: 14px;
+ font-weight: bold;
+ padding-top: 1em;
+}
+#calNav a.showNext{
display: block;
float: right;
}
-#showPrevMonth {
+#calNav a.showPrev {
display: block;
float: left;
+ margin-left: 547px;
}
-#monthNav {
- clear: both;
- font-size: 14px;
- font-weight: bold;
- padding-top: 1em;
+#calNav a.showPrev.month {
+ margin-left: 446px;
}
-
/* ====================== CALENDAR INFO BOX ========================== */
a.view_info_box {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9365],
Torstein <=