adding button print calendar toolbar, adding template for the print window, ajusting indentation

This commit is contained in:
Alexandre Cloutier
2014-04-03 16:47:02 -04:00
parent 49363cfe36
commit cb5e6e7ef2
5 changed files with 284 additions and 218 deletions

View File

@@ -35,7 +35,7 @@
{
NSArray *toolbarConfig;
NSArray *toolbarGroup;
NSString *toolbar;
NSString *toolbar;
NSDictionary *buttonInfo;
}
@@ -60,7 +60,7 @@
[toolbarGroup release];
[toolbarConfig release];
[buttonInfo release];
[toolbar release];
[toolbar release];
[super dealloc];
}

View File

@@ -37,6 +37,12 @@
onclick = "return onMonthOverview();";
image = "month-view.png";
tooltip = "Switch to month view"; } ),
( { link = "#";
onclick = "";
cssClass = "tbicon_print single-window-not-conditional";
image = "tb-mail-print-flat-24x24.png";
label = "Print View";
tooltip = "Print the current calendar view"; } ),
( { link = "#";
label="Delete";
onclick = "return deleteEvent(this);";

View File

@@ -0,0 +1,109 @@
<?xml version='1.0' standalone='yes'?>
<!DOCTYPE var:component>
<var:component
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
className="UIxPageFrame"
title="name"
const:popup="YES">
<div>
<!-- Print settings -->
<span class="caption"><var:string label:value="Print Settings" /></span>
<table class="frame">
<tr>
<td>
<label><var:string label:"Title">
<input type="text" class="textField" name="title" id="title" /></label></td></tr>
<tr>
<td>
<label><var:string label:"Layout">
<var:popup list="layoutList" item="item"
label:noSelectionString="layoutList_list"
string="itemLayoutListText"
selection="" /></label></td></tr>
</table>
<!-- What to print -->
<span class="caption"><var:string label:value="What to Print" /></span>
<table class="frame">
<tr>
<td>
<label>
<input type="checkbox"
const:name="selectEvents"
const:id="selectEvents"
var:checked="printEvents" />
<var:string label:value="Events"/></label></td>
<td>
<label>
<input type="checkbox"
const:name="selectTasks"
const:id="selectTasks"
var:checked="printTasks" />
<var:string label:value="Tasks"/></label></td></tr>
<tr>
<td>
<label>
<var:string label:"Current view">
<!-- TODO-Radio button --></label></td></tr>
<tr>
<td>
<label>
<var:string label:"Selected events/tasks">
<!-- TODO-Radio button --></label></td></tr>
<tr>
<td>
<label>
<var:string label:"Custom date range">
<!-- TODO-Radio button --></label></td></tr>
<tr>
<td>
<label>
<var:string label:"From:">
<!-- TODO-Date picker --></label></td></tr>
<tr>
<td>
<label>
<var:string label:"To:">
<!-- TODO-Date picker --></label></td></tr>
</table>
<!-- Options -->
<span class="caption"><var:string label:value="Options" /></span>
<table class="frame">
<tr>
<td>
<label>
<input type="checkbox"
const:name="selectNoDueDateTasks"
const:id="selectNoDueDateTasks"
var:checked="printNoDueDateTasks" />
<var:string label:value="Tasks with no due date"/></label></td></tr>
<tr>
<td>
<label>
<input type="checkbox"
const:name="selectCompletedTasks"
const:id="selectCompletedTasks"
var:checked="printCompletedTasks" />
<var:string label:value="Completed tasks"/></label></td></tr>
</table>
<!-- Buttons -->
<div id="buttons">
<a class="button" name="submit" id="submitButton">
<span>
<var:string label:value="Print" /></span></a>
<a class="button" name="cancel" id="cancelButton">
<span>
<var:string label:value="Cancel"/></span></a>
</div>
</div>

View File

@@ -6,195 +6,155 @@
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
><var:string var:value="doctype" const:escapeHTML="NO" />
<var:if condition="hideFrame" const:negate="YES"
><html const:xmlns="http://www.w3.org/1999/xhtml"
xml:lang="en" const:lang="en">
xmlns:label="OGo:label">
<var:string var:value="doctype" const:escapeHTML="NO" />
<var:if condition="hideFrame" const:negate="YES">
<html const:xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" const:lang="en">
<!-- head -->
<head>
<title>
<var:string value="title"/>
</title>
<meta name="hideFrame" var:content="hideFrame" />
<meta name="description" content="SOGo Web Interface" />
<meta name="author" content="SKYRIX Software AG/Inverse inc." />
<meta name="robots" content="stop" />
<meta name="build" var:content="buildDate" />
<link href="mailto:support@inverse.ca" rev="made" />
<link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
<link type="text/css" rel="stylesheet" rsrc:href="generic.css" />
<link type="text/css" rel="stylesheet" rsrc:href="dtree.css" />
<var:if condition="hasProductSpecificCSS"
><link type="text/css" rel="stylesheet" var:href="productCSSURL"
/></var:if>
<var:if condition="hasPageSpecificCSS"
><link type="text/css" rel="stylesheet" var:href="pageCSSURL"
/></var:if>
<var:foreach list="additionalCSSFiles" item="item"
><link type="text/css" rel="stylesheet" var:href="item"
/>
</var:foreach>
<var:if-ie const:lte="9"
><link type="text/css" rel="stylesheet" rsrc:href="iefixes.css"/>
<title>
<var:string value="title"/></title>
<meta name="hideFrame" var:content="hideFrame" />
<meta name="description" content="SOGo Web Interface" />
<meta name="author" content="SKYRIX Software AG/Inverse inc." />
<meta name="robots" content="stop" />
<meta name="build" var:content="buildDate" />
<link href="mailto:support@inverse.ca" rev="made" />
<link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
<link type="text/css" rel="stylesheet" rsrc:href="generic.css" />
<link type="text/css" rel="stylesheet" rsrc:href="dtree.css" />
<var:if condition="hasProductSpecificCSS">
<link type="text/css" rel="stylesheet" var:href="productCSSURL"/></var:if>
<var:if condition="hasPageSpecificCSS">
<link type="text/css" rel="stylesheet" var:href="pageCSSURL"/></var:if>
<var:foreach list="additionalCSSFiles" item="item">
<link type="text/css" rel="stylesheet" var:href="item"/></var:foreach>
<var:if-ie const:lte="9">
<link type="text/css" rel="stylesheet" rsrc:href="iefixes.css"/>
<script type="text/javascript" rsrc:src="XMLHttpRequest.js"><!-- space --></script>
</var:if-ie>
</var:if-ie>
</head>
<body var:class="bodyClasses"
><var:if condition="isCompatibleBrowser"
><var:if condition="singleWindowModeEnabled"
><div id="popupFrame" style="display: none;"><iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe></div></var:if
><var:if condition="shortUserNameForDisplay" const:value="anonymous"
const:negate="YES"><var:if condition="hasUserSettingsKeys"
><script type="text/javascript">
var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;
</script
></var:if><var:if condition="hasUserDefaultsKeys">
<!-- Body -->
<body var:class="bodyClasses">
<var:if condition="isCompatibleBrowser">
<var:if condition="singleWindowModeEnabled">
<div id="popupFrame" style="display: none;">
<iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe></div></var:if>
<var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
<var:if condition="hasUserSettingsKeys">
<script type="text/javascript">
var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO"/>;
</script
></var:if
></var:if
><var:if condition="isPopup" const:negate="YES"
><var:if condition="isUIxDebugEnabled"
><div id="logConsole"><!-- space --></div></var:if>
var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;</script></var:if>
<var:if condition="hasUserDefaultsKeys">
<script type="text/javascript">
var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO"/>;</script></var:if></var:if>
<var:if condition="isPopup" const:negate="YES">
<var:if condition="isUIxDebugEnabled">
<div id="logConsole"><!-- space --></div></var:if>
<!-- Link banner -->
<div id="linkBanner" class="linkbanner">
<var:if condition="canLogoff"
><a id="logoff" var:href="logoffPath"
><var:string label:value="Disconnect"/> </a
><span id="userIdentificationDisplay">
<var:if condition="userHasVacationEnabled"><img rsrc:src="status.vacation-msg.png" label:title="Vacation message is enabled" /></var:if>
<var:string var:value="userIdentification"/></span
></var:if>
<var:if condition="userHasCalendarAccess">
<var:if condition="isCalendar">
<span class="active"><var:string label:value="Calendar"
/></span>
</var:if>
<var:if condition="isCalendar" const:negate="YES">
<a id="calendarBannerLink"
var:href="relativeCalendarPath"
><var:string label:value="Calendar" /></a>
</var:if>
<var:if condition="canLogoff">
<a id="logoff" var:href="logoffPath">
<var:string label:value="Disconnect"/></a>
<span id="userIdentificationDisplay">
<var:if condition="userHasVacationEnabled">
<img rsrc:src="status.vacation-msg.png" label:title="Vacation message is enabled" /></var:if>
<var:string var:value="userIdentification"/></span></var:if>
<var:if condition="userHasCalendarAccess">
<var:if condition="isCalendar">
<span class="active"><var:string label:value="Calendar"/><!-- space --></span></var:if>
<var:if condition="isCalendar" const:negate="YES">
<a id="calendarBannerLink" var:href="relativeCalendarPath">
<var:string label:value="Calendar" /></a></var:if></var:if>
<var:if condition="isContacts">
<span class="active"><var:string label:value="Address Book"/><!-- space --></span></var:if>
<var:if condition="isContacts" const:negate="YES">
<a id="contactsBannerLink" var:href="relativeContactsPath">
<var:string label:value="Address Book" /></a></var:if>
<var:if condition="userHasMailAccess">
<var:if condition="isMail">
<span class="active"><var:string label:value="Mail"/><!-- space --></span></var:if>
<var:if condition="isMail" const:negate="YES">
<a id="mailBannerLink" var:href="relativeMailPath">
<var:string label:value="Mail" /></a></var:if></var:if>
<a id="preferencesBannerLink" var:href="relativePreferencesPath">
<var:string label:value="Preferences" /></a>
<var:if condition="isSuperUser">
<var:if condition="isAdministration">
<span class="active"><var:string label:value="Administration"/></span></var:if>
<var:if condition="isAdministration" const:negate="YES">
<a id="administrationBannerLink" var:href="relativeAdministrationPath">
<var:string label:value="Administration" /></a></var:if></var:if>
<var:if condition="isUIxDebugEnabled">
<a id="consoleBannerLink" href="#">
<var:string label:value="Log Console (dev.)" /></a></var:if></div></var:if>
<!-- ToolBar -->
<var:component className="UIxToolbar" var:toolbar="toolbar" />
</var:if>
<var:if condition="isContacts">
<span class="active"><var:string label:value="Address Book"
/></span>
</var:if>
<var:if condition="isContacts" const:negate="YES">
<a id="contactsBannerLink"
var:href="relativeContactsPath"
><var:string label:value="Address Book" /></a>
</var:if>
<var:if condition="userHasMailAccess">
<var:if condition="isMail">
<span class="active"><var:string label:value="Mail"
/></span>
</var:if>
<var:if condition="isMail" const:negate="YES">
<a id="mailBannerLink" var:href="relativeMailPath"
><var:string label:value="Mail" /></a>
</var:if>
</var:if>
<a id="preferencesBannerLink"
var:href="relativePreferencesPath"
><var:string label:value="Preferences" /></a>
<var:if condition="isSuperUser">
<var:if condition="isAdministration">
<span class="active"><var:string label:value="Administration"
/></span>
</var:if>
<var:if condition="isAdministration" const:negate="YES">
<a id="administrationBannerLink" var:href="relativeAdministrationPath"
><var:string label:value="Administration" /></a>
</var:if>
</var:if>
<var:if condition="isUIxDebugEnabled"
> <a id="consoleBannerLink"
href="#"><var:string
label:value="Log Console (dev.)" /></a
></var:if>
</div>
</var:if
><var:component className="UIxToolbar" var:toolbar="toolbar"
/>
<div id="pageContent"><var:component-content/></div>
<div id="javascriptSafetyNet"><!-- space --></div>
<script type="text/javascript">
var ApplicationBaseURL = '<var:string value="modulePath"/>';
var ResourcesURL = '<var:string value="applicationPath"/>.woa/WebServerResources';
var minimumSearchLength = <var:string value="minimumSearchLength"/>;
<var:if condition="isSuperUser"
>var IsSuperUser = true;
</var:if>
<var:if condition="isSuperUser" const:negate="YES"
>var IsSuperUser = false;
</var:if>
<var:if condition="usesCASAuthentication"
>var usesCASAuthentication = true;
</var:if>
<var:if condition="usesCASAuthentication" const:negate="YES"
>var usesCASAuthentication = false;
</var:if>
<var:if condition="shortUserNameForDisplay" const:value="anonymous"
const:negate="YES"
>var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
</var:if>
<var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
<var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
</script>
<script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="jquery.js"><!-- space --></script>
<!-- Page Content -->
<div id="pageContent"><var:component-content/><!-- space --></div>
<div id="javascriptSafetyNet"><!-- space --></div>
<script type="text/javascript">
var ApplicationBaseURL = '<var:string value="modulePath"/>';
var ResourcesURL = '<var:string value="applicationPath"/>.woa/WebServerResources';
var minimumSearchLength = <var:string value="minimumSearchLength"/>;
<var:if condition="isSuperUser">
var IsSuperUser = true;</var:if>
<var:if condition="isSuperUser" const:negate="YES">
var IsSuperUser = false;</var:if>
<var:if condition="usesCASAuthentication">
var usesCASAuthentication = true;</var:if>
<var:if condition="usesCASAuthentication" const:negate="YES">
var usesCASAuthentication = false;</var:if>
<var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>'; </var:if>
<var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
<var:string value="productLocalizableStrings" const:escapeHTML="NO"/></script>
<script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="jquery.js"><!-- space --></script>
<script>jQuery.noConflict();</script>
<script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-sogo.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="generic.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="SOGoTabsController.js"><!-- space --></script>
<var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
var:src="productJavaScriptURL"><!-- space --></script></var:if>
<var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
var:src="pageJavaScriptURL"><!-- space --></script></var:if>
<var:foreach list="additionalJSFiles" item="item"
><script type="text/javascript" var:src="item"><!-- space --></script>
</var:foreach>
<var:foreach list="systemAdditionalJSFiles" item="item"
><script type="text/javascript" var:src="item"><!-- space --></script>
</var:foreach>
</var:if>
<var:if condition="isCompatibleBrowser" const:negate="YES"
><var:component className="SOGoBrowsersPanel"
/></var:if>
<noscript>
<div class="javascriptPopupBackground">
</div>
<div class="javascriptMessagePseudoWindow noJavascriptErrorMessage">
<var:string label:value="noJavascriptError"
/><br /><br
/><a class="button" var:href="page.context.uri"
><var:string label:value="noJavascriptRetry"
/></a>
</div>
</noscript>
<script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-sogo.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="generic.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="SOGoTabsController.js"><!-- space --></script>
<var:if condition="hasProductSpecificJavaScript">
<script type="text/javascript" var:src="productJavaScriptURL"><!-- space --></script></var:if>
<var:if condition="hasPageSpecificJavaScript">
<script type="text/javascript" var:src="pageJavaScriptURL"><!-- space --></script></var:if>
<var:foreach list="additionalJSFiles" item="item">
<script type="text/javascript" var:src="item"><!-- space --></script></var:foreach>
<var:foreach list="systemAdditionalJSFiles" item="item">
<script type="text/javascript" var:src="item"><!-- space --></script></var:foreach></var:if>
<var:if condition="isCompatibleBrowser" const:negate="YES">
<var:component className="SOGoBrowsersPanel"/></var:if>
<noscript>
<div class="javascriptPopupBackground"><!-- space --></div>
<div class="javascriptMessagePseudoWindow noJavascriptErrorMessage">
<var:string label:value="noJavascriptError"/><br /><br/>
<a class="button" var:href="page.context.uri">
<var:string label:value="noJavascriptRetry"/></a></div></noscript>
</body>
</html>
</var:if>
<var:if condition="hideFrame">
<var:component-content />
</var:if>
<var:component-content /></var:if>
</container>

View File

@@ -7,45 +7,36 @@
xmlns:label="OGo:label"
xmlns:so="http://www.skyrix.com/od/so-lookup">
<div id="toolbar" class="toolbar">
<var:foreach list="toolbarConfig" item="toolbarGroup"
><var:foreach list="toolbarGroup" item="buttonInfo"
><var:if condition="isButtonEnabled"
><a var:class="cssClasses"
<var:foreach list="toolbarConfig" item="toolbarGroup">
<var:foreach list="toolbarGroup" item="buttonInfo">
<var:if condition="isButtonEnabled">
<a var:class="cssClasses"
var:href="buttonInfo.link"
var:target="buttonInfo.target"
var:onclick="buttonInfo.onclick"
var:title="buttonTooltip"
><span><img class="buttonImage"
var:src="buttonImage"
var:alt="buttonTooltip"
/><var:if condition="hasMenu"
><img class="buttonMenuArrow"
rsrc:src="arrow-dwn-sharp.gif"
var:alt="buttonTooltip"
/></var:if
><br/><var:string value="buttonLabel"
/></span>
</a></var:if
><var:if condition="isButtonEnabled"
const:negate="YES"
><span var:class="cssClasses"
><img class="buttonImage"
var:title="buttonTooltip">
<span><img class="buttonImage"
var:src="buttonImage"
var:alt="buttonTooltip"
/><br
/><span class="buttonLabel"
><var:string
value="buttonLabel"
/></span
></span
></var:if
></var:foreach>
<var:if condition="isLastGroup" const:negate="YES"
><span class="toolbarSeparator"
><var:entity const:name="nbsp"
/></span
></var:if>
</var:foreach>
<img id="progressIndicator" rsrc:src="busy.gif" />
var:alt="buttonTooltip"/>
<var:if condition="hasMenu">
<img class="buttonMenuArrow"
rsrc:src="arrow-dwn-sharp.gif"
var:alt="buttonTooltip"/></var:if><br/>
<var:string value="buttonLabel"/></span></a></var:if>
<var:if condition="isButtonEnabled" const:negate="YES">
<span var:class="cssClasses">
<img class="buttonImage"
var:src="buttonImage"
var:alt="buttonTooltip"/><br/>
<span class="buttonLabel">
<var:string value="buttonLabel"/></span></span></var:if></var:foreach>
<var:if condition="isLastGroup" const:negate="YES">
<span class="toolbarSeparator">
<var:entity const:name="nbsp"/></span></var:if></var:foreach>
<img id="progressIndicator" rsrc:src="busy.gif" />
</div>
</var:if>