amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-18 19:48:53 +00:00
Code Issues Projects Releases Wiki Activity

applied comments

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-05-08 19:14:39 -04:00
parent da8febf138
commit fc3cfa5484
7 changed files with 54 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UI/Scheduler/English.lproj/Localizable.strings
View File

@@ -5,6 +5,7 @@
"Create a new event" = "Create a new event";
"Create a new task" = "Create a new task";
"Edit this event or task" = "Edit this event or task";
"Print the current calendar view" = "Print the current calendar view";
"Delete this event or task" = "Delete this event or task";
"Go to today" = "Go to today";
"Switch to day view" = "Switch to day view";
@@ -117,7 +118,7 @@
"Name of the Calendar" = "Name of the Calendar";
"new" = "New";
"printview" = "Print View";
"Print view" = "Print view";
"edit" = "Edit";
"delete" = "Delete";
"proposal" = "Proposal";
@@ -147,8 +148,6 @@
/* Print view */
"LIST" = "List";
"DAY" = "Daily";
"WEEK" = "Weekly";
"Print Settings" = "Print Settings";
"Title:" = "Title:";
"Layout:" = "Layout:";

2
UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
View File

@@ -41,7 +41,7 @@
onclick = "return printView();";
cssClass = "tbicon_print single-window-not-conditional";
image = "tb-mail-print-flat-24x24.png";
label = "Print View";
label = "Print view";
tooltip = "Print the current calendar view"; } ),
( { link = "#";
label="Delete";

2
UI/Scheduler/UIxCalViewPrint.m
View File

@@ -32,7 +32,7 @@ static NSArray *layoutItems = nil;
{
if (!layoutItems)
{
layoutItems = [NSArray arrayWithObjects: @"LIST", @"DAY", @"WEEK", nil];
layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Weekly", nil];
[layoutItems retain];
}

29
UI/Templates/SchedulerUI/UIxCalViewPrint.wox
View File

@@ -7,9 +7,7 @@
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
className="UIxPageFrame"
const:popup="YES"
const:cssFiles="datepicker.css"
const:jsFiles="datepicker.js" >
const:popup="YES">
<div id="leftSide" class="no-print">
<!-- Print settings -->
@@ -42,23 +40,24 @@
<label>
<input type="checkbox" id ="printTasks" value="tasksSelected" checked="true" onChange="onTasksCheck(this);"/>
<var:string label:value="Tasks"/></label></td></tr>
<tr class="todo">
<!-- TODO
<tr>
<td>
<label>
<input type="radio" name="printView" id="currentView" value="currentViewSelected" checked="true" onChange="onPrintDateCheck();"/>
<var:string label:value="Current view" /></label></td></tr>
<tr class="todo">
<tr>
<td>
<label>
<input type="radio" name="printView" id="eventsTasks" value="eventsTasksSelected" onChange="onPrintDateCheck();"/>
<var:string label:value="Selected events and tasks" /></label></td></tr>
<tr class="todo">
<tr>
<td>
<label>
<input type="radio" name="printView" id="customDate" value="customDateSelected" onChange="onPrintDateCheck();" />
<var:string label:value="Custom date range" /></label></td></tr>
<tr class="todo">
<tr>
<td id="dateRangeFrom" name="dateRange">
<label id="labelFrom"><var:string label:value="From:" /></label>
<var:component className="UIxDatePicker"
@@ -67,7 +66,7 @@
month="startMonth"
year="startYear"
label:label="Select starting date"/></td></tr>
<tr class="todo">
<tr>
<td id="dateRangeTo" name="dateRange">
<label id="labelTo"><var:string label:value="To:" /></label>
<var:component className="UIxDatePicker"
@@ -76,24 +75,12 @@
month="endMonth"
year="endYear"
label:label="Select ending date"/></td></tr>
-->
</table>
<!-- Options -->
<span class="caption"><var:string label:value="Options" /></span>
<table class="frame">
<tr>
<td>
<var:string label:value="Display time:" /></td>
<td>
<label>
<input type="radio" name="printTimeFormat" value="localTimeSelected" onChange="onDisplayTimeFormatCheck();" checked="true"/>
<var:string label:value="Locale" /></label>
<label>
<input type="radio" name="printTimeFormat" value="gmtTimeSelected" onChange="onDisplayTimeFormatCheck();"/>
<var:string label:value="GMT" /></label></td></tr>
<tr>
<td colspan="2">
<hr><!-- spacer --></hr></td></tr>
<tr>
<td>
<label>

12
UI/WebServerResources/SchedulerUI.css
View File

@@ -464,9 +464,11 @@ DIV.eventView
/* new draggable presentation */
DIV#daysView DIV.hours
{ position: absolute;
{ display: inline-block;
position: relative;
float: left;
top: 0px;
left: 0px;
left: 0;
height: 960px;
width: 50px; }
@@ -484,6 +486,9 @@ DIV#daysView DIV.hour
DIV#daysView DIV.days
{ position: relative;
left: 0;
right: 0;
top: 0;
margin-left: 50px; }
DIV.multicolumnDayView DIV.lastDayUser
@@ -684,8 +689,7 @@ DIV.daysViewFor7Days DIV.day5
DIV.monthView DIV.day6,
DIV.daysViewFor7Days DIV.day6
{ left: 85.7142%;
border-right: 1px solid #909090; }
{ left: 85.7142%; }
/* "left" and "width" for #daysView DIV.event are computed in JS code */
#daysView DIV.event

54
UI/WebServerResources/UIxCalViewPrint.css
View File

@@ -40,6 +40,10 @@ INPUT#inputFieldTitle {
width:120px;
}
DIV#rightFrameTitle
{
font-size:20px;
}
/******************************/
/****** What to print ********/
@@ -139,41 +143,32 @@ DIV#calendarHeader {
position:relative;
top:0;
height:70px;
right: 0px;
}
DIV#calendarHeader DIV.dayLabels {
DIV#calendarHeader DIV.dayLabels,
DIV#calendarHeader DIV.days {
position:relative;
display:flex;
left:0;
left: 0;
margin-left:50px;
}
DIV#calendarHeader DIV.days {
position:relative;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
top:0;
height:33px;
left:0;
margin-left:50px;
top: 0;
height: 33px;
left: 0;
right: 0;
}
DIV#daysView {
position:relative;
top:0;
display:inline-table;
width:100%;
position: relative;
top: 0;
right: 8px;
border-right: 1px solid #ccc;
}
DIV#daysView DIV.days {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
DIV#daysView DIV.hours {
height: auto;
}
DIV#daysView DIV.day DIV.clickableHourCell {
@@ -184,18 +179,7 @@ DIV#daysView DIV.hour {
height: 27px;
}
.minutes15, .minutes30, .minutes45 {
height:25%;
}
DIV#daysView DIV.day0,
DIV#daysView DIV.day1,
DIV#daysView DIV.day2,
DIV#daysView DIV.day3,
DIV#daysView DIV.day4,
DIV#daysView DIV.day5,
DIV#daysView DIV.day6 {
position:relative;
left:0;
height: 25%;
}
DIV.event{

54
UI/WebServerResources/UIxCalViewPrint.js
View File

@@ -23,7 +23,6 @@
/******************************** Global variables *******************************************/
var firstDayOfWeek = window.opener.firstDayOfWeek;
var displayTime=true;
var printCompletedTasks=1;
var printNoDueDateTasks=1;
var eventsBlocks;
@@ -31,14 +30,6 @@ var currentView;
var currentDay = window.parentvar("currentDay");
var sd, ed;
/******************************************* Ajust Window position from its size ***********************************************************/
function ajustWindow(width, height) {
var left = (screen.width/2)-(width/2);
var top = (screen.height/2)-(height/2);
window.moveTo(left, top);
}
/****************************************** Ajax Requests, callbacks & events/tasks drawings ***************************************************/
function refreshContent() {
@@ -244,7 +235,7 @@ function _drawTasksList(tasksBlocks) {
$("rightFrameTasks").innerHTML = tasksList;
}
// TODO : Maybe use the drawfunction from the scheduler.js
// TODO : Maybe use the drawfunction from the schedulerUI.js
function _drawEvents(events, eventsData) {
var daysView = $("daysView");
@@ -403,10 +394,7 @@ function _parseEvent(event) {
var endDate = new Date(event[6] *1000);
parsedEvent = "<div class=divEventsPreview><table>";
parsedEvent += "<tr><td><b>"+ event[4] +"</b></td></tr>";
if (displayTime)
parsedEvent += "<tr><td>"+ startDate.toLocaleString() + " - " + endDate.toLocaleString() + "</td></tr>";
else
parsedEvent += "<tr><td>"+ startDate.toGMTString() + "<br />" + endDate.toGMTString() + "</td></tr>";
parsedEvent += "<tr><td>"+ startDate.toLocaleString() + " - " + endDate.toLocaleString() + "</td></tr>";
parsedEvent += "<tr><td><var:string label:value='Calendar: ' />" + event[2] + "</td></tr>";
parsedEvent += "</table></div>";
return parsedEvent;
@@ -427,10 +415,7 @@ function _parseTask(task) {
if (task[5] != null) {
dueDate = new Date(task[5] *1000);
if (displayTime)
parsedTask += "<tr><td class=\"EventsTasksDate\">"+ dueDate.toLocaleString() + "</td></tr>";
else
parsedTask += "<tr><td class=\"EventsTasksDate\">"+ dueDate.toGMTString() + "</td></tr>";
parsedTask += "<tr><td class=\"EventsTasksDate\">"+ dueDate.toLocaleString() + "</td></tr>";
}
parsedTask += "<tr><td><var:string label:value='Calendar: ' />" + task[2] + "</td></tr>";
parsedTask += "</table></div>";
@@ -510,19 +495,16 @@ function onPrintLayoutListChange() {
switch(selectedLayout) {
case "0": // List view
window.resizeTo(660,500);
ajustWindow(660,500);
currentView = parentView;
break;
case "1": // Day view
window.resizeTo(1010,500);
ajustWindow(1010,500);
currentView = "dayview";
break;
case "2": // Week view
window.resizeTo(1010,500);
ajustWindow(1010,500);
currentView = "weekview";
break;
@@ -550,19 +532,13 @@ function onTasksCheck(checkBox) {
document.getElementById("rightFrameTasks").style.display = 'none';
}
function onPrintDateCheck() {
/*function onPrintDateCheck() {
var dateRange = document.getElementsByName("dateRange");
var customDate = document.getElementById("customDate");
for (var i = 0; i < dateRange.length; i++)
if (dateRange[i].children[1].children[0].disabled == customDate.checked)
dateRange[i].children[1].children[0].disabled = !customDate.checked;
}
function onDisplayTimeFormatCheck(){
var radioTimeFormat = document.getElementsByName("printTimeFormat");
displayTime = (radioTimeFormat[0].checked ? true : false);
refreshContent();
}
}*/
function onPrintCompletedTasksCheck(checkBox) {
printCompletedTasks = (checkBox.checked ? 1 : 0);
@@ -574,7 +550,7 @@ function onPrintNoDueDateTasksCheck(checkBox) {
refreshTasks();
}
/************** Date picker functions *************/
/************** Date picker functions *************
this.initTimeWidgets = function (widgets) {
this.timeWidgets = widgets;
@@ -583,13 +559,13 @@ this.initTimeWidgets = function (widgets) {
//jQuery(widgets['start']['date']).change(onAdjustTime);
/*jQuery(widgets['startingDate']['date']).closest('.date').datepicker({autoclose: true,
jQuery(widgets['startingDate']['date']).closest('.date').datepicker({autoclose: true,
weekStart: 0,
endDate: lastDay,
startDate: firstDay,
setStartDate: lastDay,
startView: 2,
position: "below-shifted-left"});*/
position: "below-shifted-left"});
}
this.onAdjustTime = function(event) {
@@ -597,9 +573,9 @@ this.onAdjustTime = function(event) {
}
this.onAdjustDueTime = function(event) {
/*var dateDelta = (window.getStartDate().valueOf() - window.getShadowStartDate().valueOf());
var dateDelta = (window.getStartDate().valueOf() - window.getShadowStartDate().valueOf());
var newDueDate = new Date(window.getDueDate().valueOf() + dateDelta);
window.setDueDate(newDueDate);*/
window.setDueDate(newDueDate);
window.timeWidgets['start']['date'].updateShadowValue();
}
@@ -621,14 +597,14 @@ function onPrintClick(event) {
function init() {
initializePrintSettings();
initializeWhatToPrint();
//initializeWhatToPrint();
//initializeOptions();
$("cancelButton").observe("click", onPrintCancelClick);
$("printButton").observe("click", onPrintClick);
// TODO : Selected and custom date must be implemented and finished.
/* TODO : Selected and custom date must be implemented and finished.
document.getElementById("eventsTasks").disabled=true;
document.getElementById("customDate").disabled=true;
document.getElementById("customDate").disabled=true;*/
onPrintLayoutListChange();
}
@@ -638,13 +614,13 @@ function initializePrintSettings() {
$("printLayoutList").observe("change", onPrintLayoutListChange);
}
function initializeWhatToPrint() {
/*function initializeWhatToPrint() {
var widgets = {'start': {'date': $("startingDate")},
'end': {'date': $("endingDate")}};
initTimeWidgets(widgets);
onPrintDateCheck();
}
}*/
/*function initializeOptions() {
}*/