amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-22 14:52:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #2969

Browse Source 
Monotone-Parent: 34dbce3026b164b07c558711781fcfb5cde0fcff
Monotone-Revision: 1d653d4f984b0eeefbcd5014a68753ef3d761b3c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-04T19:55:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-11-04 19:55:50 +00:00
parent 07225fe588
commit 7a2eff59ea
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
UI/SOGoUI/UIxComponent.m
View File

@@ -25,6 +25,7 @@
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSKeyValueCoding.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSString.h>
#import <NGObjWeb/SoHTTPAuthenticator.h>
#import <NGObjWeb/SoObjects.h>
@@ -240,10 +241,19 @@ static BOOL uixDebugEnabled = NO;
- (void) setSelectedDateQueryParameter: (NSCalendarDate *) _newDate
inDictionary: (NSMutableDictionary *) _qp
{
NSString *day;
if (_newDate)
[_qp setObject: [self dateStringForDate: _newDate] forKey: @"day"];
{
day = [self dateStringForDate: _newDate];
[_qp setObject: day forKey: @"day"];
[_qp setObject: [day substringToIndex: 6] forKey: @"month"];
}
else
[_qp removeObjectForKey:@"day"];
{
[_qp removeObjectForKey:@"day"];
[_qp removeObjectForKey:@"month"];
}
}
- (NSString *) completeHrefForMethod: (NSString *) _method

12
UI/Templates/SchedulerUI/UIxCalMonthView.wox
View File

@@ -9,35 +9,35 @@
<a href="#"
class="leftNavigationArrow"
var:date="prevMonthQueryParameters.day"
var:date="prevMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><img rsrc:src="arrow-lft-sharp.gif"/></a>
<span class="monthsHeader">
<span class="month2"><a href="#"
var:date="monthBeforePrevMonthQueryParameters.day"
var:date="monthBeforePrevMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><var:string value="monthNameOfTwoMonthAgo"
/></a></span
><span class="month1"><a href="#"
var:date="prevMonthQueryParameters.day"
var:date="prevMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><var:string value="monthNameOfOneMonthAgo"
/></a></span
><span class="month0"><var:string value="monthNameOfThisMonth" /></span
><span class="month1"><a href="#"
var:date="nextMonthQueryParameters.day"
var:date="nextMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><var:string value="monthNameOfNextMonth"
/></a></span
><span class="month2"><a href="#"
var:date="monthAfterNextMonthQueryParameters.day"
var:date="monthAfterNextMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><var:string value="monthNameOfTheMonthAfterNextMonth"
/></a></span
></span>
<a href="#"
class="rightNavigationArrow"
var:date="nextMonthQueryParameters.day"
var:date="nextMonthQueryParameters.month"
onclick="return onCalendarGotoDay(this);"
><img rsrc:src="arrow-rit-sharp.gif"/></a>

11
UI/WebServerResources/SchedulerUI.js
View File

@@ -395,6 +395,9 @@ function onViewEventCallback(http) {
div.show();
}
}
else {
log("onViewEventCallback ajax error:" + http.url);
}
}
function editDoubleClickedEvent(event) {
@@ -707,8 +710,11 @@ function restoreCurrentDaySelection(div) {
function changeDateSelectorDisplay(day, keepCurrentDay) {
var url = ApplicationBaseURL + "dateselector";
if (day)
if (day) {
if (day.length < 8)
day += "01";
url += "?day=" + day;
}
if (day != currentDay) {
if (!keepCurrentDay)
@@ -781,6 +787,9 @@ function changeCalendarDisplay(data, newView) {
return false;
}
else if (day.length == 6) {
day += "01";
}
}
url += "?day=" + day;
}