- see ChangeLog;
Monotone-Parent: 8ddb2a0ff49be672a150054c0e9781c669a91f34 Monotone-Revision: cf18a9ab5ead55ed9cf2650fae505a079dd489ad Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-07-05T13:27:18 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
d0bb1b8d04
commit
a5e621970a
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2006-07-05 Wolfgang Sourdeau <wolfgang@contre.com>
|
||||||
|
|
||||||
|
* UI/Templates/UIxPageFrame.wox: use the exact html code as below.
|
||||||
|
|
||||||
|
* UI/Templates/MailerUI/UIxMailMainFrame.wox: redone the
|
||||||
|
linkbanner as a DIV instead of a TABLE.
|
||||||
|
|
||||||
|
* UI/MailerUI/UIxMailMainFrame.m [UIxMailMainFrame
|
||||||
|
showLinkBanner]:
|
||||||
|
returns 'YES' to request the display of the navigation bar between
|
||||||
|
applets.
|
||||||
|
|
||||||
2006-06-15 ludovic@inverse.ca
|
2006-06-15 ludovic@inverse.ca
|
||||||
|
|
||||||
* It's now possible to set the default
|
* It's now possible to set the default
|
||||||
|
|
|
@ -150,11 +150,13 @@ static NSString *treeRootClassName = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)showLinkBanner {
|
- (BOOL)showLinkBanner {
|
||||||
return NO;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *)bannerToolbarStyle {
|
- (NSString *)bannerToolbarStyle {
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *)bannerConsumeStyle {
|
- (NSString *)bannerConsumeStyle {
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,163 +1,121 @@
|
||||||
<?xml version="1.0" standalone="yes"?>
|
<?xml version="1.0" standalone="yes"?>
|
||||||
<container xmlns="http://www.w3.org/1999/xhtml"
|
<container xmlns="http://www.w3.org/1999/xhtml"
|
||||||
xmlns:var="http://www.skyrix.com/od/binding"
|
xmlns:var="http://www.skyrix.com/od/binding"
|
||||||
xmlns:const="http://www.skyrix.com/od/constant"
|
xmlns:const="http://www.skyrix.com/od/constant"
|
||||||
xmlns:rsrc="OGo:url"
|
xmlns:rsrc="OGo:url"
|
||||||
xmlns:label="OGo:label"
|
xmlns:label="OGo:label"
|
||||||
|
>
|
||||||
|
<var:if condition="hideFrame" const:negate="YES">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml"
|
||||||
|
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:if condition="hideFrame" const:negate="YES">
|
<head>
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml"
|
<title>
|
||||||
xmlns:var="http://www.skyrix.com/od/binding"
|
<var:string value="title"/>
|
||||||
xmlns:const="http://www.skyrix.com/od/constant"
|
</title>
|
||||||
xmlns:rsrc="OGo:url"
|
|
||||||
xmlns:label="OGo:label"
|
|
||||||
>
|
|
||||||
<head>
|
|
||||||
<title>
|
|
||||||
<var:string value="title"/>
|
|
||||||
</title>
|
|
||||||
|
|
||||||
<meta name="description" content="SOGo Web Interface"/>
|
<meta name="description" content="SOGo Web Interface"/>
|
||||||
<meta name="author" content="SKYRIX Software AG"/>
|
<meta name="author" content="SKYRIX Software AG"/>
|
||||||
<meta name="robots" content="stop"/>
|
<meta name="robots" content="stop"/>
|
||||||
|
|
||||||
<script rsrc:src="generic.js"> <!-- space required --></script>
|
<script rsrc:src="generic.js"> <!-- space required --></script>
|
||||||
<script rsrc:src="mailer.js" > <!-- space required --></script>
|
<script rsrc:src="mailer.js" > <!-- space required --></script>
|
||||||
|
|
||||||
<link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
|
<link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
|
||||||
<link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
|
<link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
|
||||||
<link type="text/css" rel="stylesheet" rsrc:href="mailer-toolbar.css"/>
|
<link type="text/css" rel="stylesheet" rsrc:href="mailer-toolbar.css"/>
|
||||||
|
|
||||||
<link href="mailto:info@skyrix.com" rev="made"/>
|
<link href="mailto:info@skyrix.com" rev="made"/>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body style="background-color: #D4D0C8;">
|
<body>
|
||||||
<!--
|
<!--
|
||||||
Note: the 'href' is required, otherwise an element-id will get created
|
Note: the 'href' is required, otherwise an element-id will get created
|
||||||
-->
|
-->
|
||||||
<form name="pageform" var:href="pageFormURL" _wosid="0">
|
<var:if condition="showLinkBanner">
|
||||||
|
<div class="linkbanner">
|
||||||
|
<!-- span style="float: left" -->
|
||||||
|
<a var:href="relativeHomePath"
|
||||||
|
><var:string label:value="Home" /></a> |
|
||||||
|
<a var:href="relativeCalendarPath"
|
||||||
|
><var:string label:value="Calendar" /></a> |
|
||||||
|
<a var:href="relativeContactsPath"
|
||||||
|
><var:string label:value="Addressbook" /></a> |
|
||||||
|
<a var:href="relativeMailPath"
|
||||||
|
><var:string label:value="Mail" /></a> |
|
||||||
|
<a href="http://to.be.done/"
|
||||||
|
><var:string label:value="Right Administration" /></a>
|
||||||
|
</div>
|
||||||
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="showLinkBanner">
|
<form name="pageform" var:href="pageFormURL" _wosid="0">
|
||||||
<table cellpadding="5" cellspacing="0" border="0" class="linkbanner">
|
|
||||||
<tr>
|
<table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
|
||||||
<td colspan="2">
|
var:style="bannerToolbarStyle">
|
||||||
<table cellpadding="0" cellspacing="0" border="0" width="100%">
|
<!-- this table is required for right alignment -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="linkbannerlinks">
|
<td valign="top" class="vertframerow">
|
||||||
<a var:href="relativeHomePath"
|
<var:component className="UIxMailToolbar" />
|
||||||
><var:string label:value="Home" /></a> |
|
</td>
|
||||||
<a var:href="relativeCalendarPath"
|
<td align="right" width="80" class="vertframerow">
|
||||||
><var:string label:value="Calendar" /></a> |
|
<table border="0"> <!-- TODO: what is this table for? -->
|
||||||
<a var:href="relativeContactsPath"
|
<tr>
|
||||||
><var:string label:value="Addressbook" /></a> |
|
<td class="tb_logocell tb_icon"
|
||||||
<a var:href="relativeMailPath"
|
><div class="tbicon_logo"> </div></td>
|
||||||
><var:string label:value="Mail" /></a> |
|
</tr>
|
||||||
<a href="http://to.be.done/"
|
</table>
|
||||||
><var:string label:value="Right Administration" /></a>
|
</td>
|
||||||
</td>
|
</tr>
|
||||||
<td class="linkbannerimage">
|
</table>
|
||||||
<a href="http://www.opengroupware.org:80/" target="OGo">
|
|
||||||
<img rsrc:src="CommonUI.SOGo/menu_logo_top.gif"
|
|
||||||
align="center" border="0" alt="OGo Logo"
|
|
||||||
valign="middle"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<!-- TODO: replace the line with a CSS straight line -->
|
<!-- consume toolbar -->
|
||||||
<table cellpadding="0" cellspacing="0" border="0" width="100%">
|
<div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
|
||||||
<tr>
|
|
||||||
<td class="linecolor"><img
|
<table border="0" width="100%" cellspacing="0" cellpadding="2">
|
||||||
rsrc:src="CommonUI.SOGo/line_left.gif"/></td>
|
<tr class="vertframerow">
|
||||||
<td class="linecolor" width="98%">
|
<td width="100%" valign="top" class="vertframerow" colspan="2">
|
||||||
<img rsrc:src="CommonUI.SOGo/line_stretch.gif"/>
|
<var:if condition="hideFolderTree">
|
||||||
</td>
|
<var:component-content/>
|
||||||
<td class="linecolor"><img
|
</var:if>
|
||||||
rsrc:src="CommonUI.SOGo/line_right.gif"/></td>
|
|
||||||
</tr>
|
<var:if condition="hideFolderTree" const:negate="YES">
|
||||||
<tr>
|
<table width="100%">
|
||||||
<td valign="top" colspan="2">
|
<tr>
|
||||||
<var:component className="UIxAppNavView" />
|
<td width="25%" valign="top" class="foldercell">
|
||||||
</td>
|
<div class="titlediv"
|
||||||
<td valign="top" align="right" class="button_submit_env">
|
><var:string label:value="Folders" /></div>
|
||||||
<a var:href="helpURL"
|
<div style="height: 95%">
|
||||||
class="button_submit"
|
<div class="embedwhite_out">
|
||||||
label:string="Help"
|
<div class="embedwhite_in">
|
||||||
var:target="helpWindowTarget"
|
<var:component className="UIxMailTree"
|
||||||
/>
|
rootClassName="treeRootClassName"
|
||||||
</td>
|
const:treeFolderAction="view"
|
||||||
</tr>
|
/>
|
||||||
</table>
|
</div>
|
||||||
</td>
|
</div>
|
||||||
</tr>
|
</div>
|
||||||
</table>
|
</td>
|
||||||
|
<td style="width: 6px;"> </td>
|
||||||
|
<td valign="top" class="contentcell">
|
||||||
|
<var:component-content/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</var:if>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
|
<var:if condition="hideFrame">
|
||||||
var:style="bannerToolbarStyle">
|
<var:component-content/>
|
||||||
<!-- this table is required for right alignment -->
|
</var:if>
|
||||||
<tr>
|
</container>
|
||||||
<td valign="top" class="vertframerow">
|
|
||||||
<var:component className="UIxMailToolbar" />
|
|
||||||
</td>
|
|
||||||
<td align="right" width="80" class="vertframerow">
|
|
||||||
<table border="0"> <!-- TODO: what is this table for? -->
|
|
||||||
<tr>
|
|
||||||
<td class="tb_logocell tb_icon"
|
|
||||||
><div class="tbicon_logo"> </div></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<!-- consume toolbar -->
|
|
||||||
<div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
|
|
||||||
|
|
||||||
<table border="0" width="100%" cellspacing="0" cellpadding="2">
|
|
||||||
<tr class="vertframerow">
|
|
||||||
<td width="100%" valign="top" class="vertframerow" colspan="2">
|
|
||||||
<var:if condition="hideFolderTree">
|
|
||||||
<var:component-content/>
|
|
||||||
</var:if>
|
|
||||||
|
|
||||||
<var:if condition="hideFolderTree" const:negate="YES">
|
|
||||||
<table width="100%">
|
|
||||||
<tr>
|
|
||||||
<td width="25%" valign="top" class="foldercell">
|
|
||||||
<div class="titlediv"
|
|
||||||
><var:string label:value="Folders" /></div>
|
|
||||||
<div style="height: 95%">
|
|
||||||
<div class="embedwhite_out">
|
|
||||||
<div class="embedwhite_in">
|
|
||||||
<var:component className="UIxMailTree"
|
|
||||||
rootClassName="treeRootClassName"
|
|
||||||
const:treeFolderAction="view"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<td style="width: 6px;"> </td>
|
|
||||||
<td valign="top" class="contentcell">
|
|
||||||
<var:component-content/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</var:if>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
</var:if>
|
|
||||||
|
|
||||||
<var:if condition="hideFrame">
|
|
||||||
<var:component-content/>
|
|
||||||
</var:if>
|
|
||||||
</container>
|
|
||||||
|
|
|
@ -25,55 +25,47 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
<div class="linkbanner">
|
||||||
|
<a var:href="relativeHomePath"
|
||||||
|
><var:string label:value="Home" /></a> |
|
||||||
|
<a var:href="relativeCalendarPath"
|
||||||
|
><var:string label:value="Calendar" /></a> |
|
||||||
|
<a var:href="relativeContactsPath"
|
||||||
|
><var:string label:value="Addressbook" /></a> |
|
||||||
|
<a var:href="relativeMailPath"
|
||||||
|
><var:string label:value="Mail" /></a> |
|
||||||
|
<a href="http://to.be.done/"
|
||||||
|
><var:string label:value="Right Administration" /></a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<table cellpadding="5" cellspacing="0" border="0" width="100%">
|
<table cellpadding="5" cellspacing="0" border="0" width="100%">
|
||||||
<tr>
|
|
||||||
<td colspan="2">
|
<!-- <tr> -->
|
||||||
<table cellpadding="0" cellspacing="0" border="0" width="100%">
|
<!-- <td colspan="2"> -->
|
||||||
<tr>
|
|
||||||
<td valign="bottom" style="font-size: 10pt;">
|
|
||||||
<a var:href="relativeHomePath"
|
|
||||||
><var:string label:value="Home" /></a> |
|
|
||||||
<a var:href="relativeCalendarPath"
|
|
||||||
><var:string label:value="Calendar" /></a> |
|
|
||||||
<a var:href="relativeContactsPath"
|
|
||||||
><var:string label:value="Addressbook" /></a> |
|
|
||||||
<a var:href="relativeMailPath"
|
|
||||||
><var:string label:value="Mail" /></a> |
|
|
||||||
<a href="http://to.be.done/"
|
|
||||||
><var:string label:value="Administration" /></a>
|
|
||||||
</td>
|
|
||||||
<td align="right">
|
|
||||||
<a href="http://www.opengroupware.org:80/" target="OGo">
|
|
||||||
<img rsrc:src="menu_logo_top.gif"
|
|
||||||
align="center" border="0" alt="" valign="middle" />
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<!-- TODO: replace the line with a CSS straight line -->
|
<!-- TODO: replace the line with a CSS straight line -->
|
||||||
<table cellpadding="0" cellspacing="0" border="0" width="100%">
|
<!-- <table cellpadding="0" cellspacing="0" border="0" width="100%"> -->
|
||||||
<tr>
|
<!-- <tr> -->
|
||||||
<td class="linecolor"><img rsrc:src="line_left.gif"/></td>
|
<!-- <td class="linecolor"><img rsrc:src="line_left.gif"/></td> -->
|
||||||
<td class="linecolor" width="98%">
|
<!-- <td class="linecolor" width="98%"> -->
|
||||||
<img rsrc:src="line_stretch.gif"/>
|
<!-- <img rsrc:src="line_stretch.gif"/> -->
|
||||||
</td>
|
<!-- </td> -->
|
||||||
<td class="linecolor"><img rsrc:src="line_right.gif"/></td>
|
<!-- <td class="linecolor"><img rsrc:src="line_right.gif"/></td> -->
|
||||||
</tr>
|
<!-- </tr> -->
|
||||||
<tr>
|
<!-- <tr> -->
|
||||||
<td valign="top" colspan="2">
|
<!-- <td valign="top" colspan="2"> -->
|
||||||
<var:component className="UIxAppNavView" />
|
<!-- <var:component className="UIxAppNavView" /> -->
|
||||||
</td>
|
<!-- </td> -->
|
||||||
<td valign="top" align="right" class="button_submit_env">
|
<!-- <td valign="top" align="right" class="button_submit_env"> -->
|
||||||
<a var:href="helpURL"
|
<!-- <a var:href="helpURL" -->
|
||||||
class="button_submit"
|
<!-- class="button_submit" -->
|
||||||
label:string="Help"
|
<!-- label:string="Help" -->
|
||||||
var:target="helpWindowTarget"
|
<!-- var:target="helpWindowTarget" -->
|
||||||
/>
|
<!-- /> -->
|
||||||
</td>
|
<!-- </td> -->
|
||||||
</tr>
|
<!-- </tr> -->
|
||||||
</table>
|
<!-- </table> -->
|
||||||
</td>
|
<!-- </td> -->
|
||||||
</tr>
|
<!-- </tr> -->
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="top" width="100%">
|
<td valign="top" width="100%">
|
||||||
<var:component-content/>
|
<var:component-content/>
|
||||||
|
|
Loading…
Reference in New Issue