LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 306c67aefff450c0e8aa8363864e5f6c435a0b84 

Monotone-Revision: 51512f2a3102841c13942d3e4e41185e38cd9b5d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-13T14:18:27
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-13 14:18:27 +00:00
parent 0c7a54bb51
commit 62bc1e01f6
4 changed files with 69 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-04-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxContactEditor.js (initEditorForm): we
need to instantiate a tabs controller here too.
2010-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoProxyAuthenticator.m (-passwordInContext:):

102
UI/Templates/ContactsUI/UIxContactEditor.wox
View File

@ -1,37 +1,38 @@
<?xml version='1.0' standalone='yes'?>
<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"
>
<form var:href="saveURL" name="editform" id="mainForm">
<!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"
>
<form var:href="saveURL" name="editform" id="mainForm">
<var:if condition="isNew"><div id="addressBookSelector">
<style type="text/css">DIV#editorTabs { top: 4.5em; };</style>
<var:string label:value="Add to:" />
<var:popup const:id="addressBooksList"
list="addressBooksList" item="addressBookItem"
string="addressBookDisplayName"
var:selection="componentAddressBook"
/>
<var:if condition="isNew"><div id="addressBookSelector">
<style type="text/css">DIV#editorTabs { top: 30px; };</style>
<var:string label:value="Add to:" />
<var:popup const:id="addressBooksList"
list="addressBooksList" item="addressBookItem"
string="addressBookDisplayName"
var:selection="componentAddressBook"
/>
</div></var:if>
<div class="tabsContainer" id="editorTabs">
<ul>
<li target="baseInfos">
<span><var:string label:value="Contact" /></span>
</li>
<li target="addressesInfos">
<span><var:string label:value="Address" /></span></li>
<li target="otherInfos">
<span><var:string label:value="Other" /></span></li>
</ul>
<div class="tabsContainer" id="editorTabs">
<ul>
<li target="baseInfos">
<span><var:string label:value="Contact" /></span>
</li>
<li target="addressesInfos">
<span><var:string label:value="Address" /></span></li>
<li target="otherInfos">
<span><var:string label:value="Other" /></span></li>
</ul>
<div class="tabs">
<div id="baseInfos" class="tab">
<span class="caption"><var:string label:value="Name" /></span>
<table class="frame">
@ -90,7 +91,7 @@
<tr>
<td>
<label><var:string label:value="Screen Name:"
/>
/>
<input type="text" class="textField" name="screenName"
id="screenName" var:value="snapshot.screenName" />
</label>
@ -99,16 +100,16 @@
<tr>
<td id="htmlMailFormat">
<label><var:string
label:value="Prefers to receive messages formatted as:" />
<var:popup list="htmlMailFormatList" item="item"
label:noSelectionString="htmlMailFormat_UNKNOWN"
string="itemHtmlMailFormatText"
selection="snapshot.mozillaUseHtmlMail"
/>
label:value="Prefers to receive messages formatted as:" />
<var:popup list="htmlMailFormatList" item="item"
label:noSelectionString="htmlMailFormat_UNKNOWN"
string="itemHtmlMailFormatText"
selection="snapshot.mozillaUseHtmlMail"
/>
</label>
</td>
</tr>
</table>
</table>
<span class="caption"><var:string label:value="Phones" /></span>
<table class="frame">
<tr>
@ -169,7 +170,7 @@
</div>
<div id="addressesInfos" class="tab">
<span class="caption"><var:string label:value="Home" /></span>
<span class="caption"><var:string label:value="Home" /></span>
<table class="frame">
<tr>
<td colspan="2">
@ -347,14 +348,15 @@
</table>
</div>
</div>
<div id="buttons">
<var:if condition="canCreateOrModify"
><a class="button actionButton" name="submit" id="submitButton">
<span><var:string label:value="Save" /></span>
</a></var:if>
<a id="cancelButton" class="button" name="cancel">
<span><var:string label:value="Cancel"/></span>
</a>
</div>
</form>
</var:component>
</div>
<div id="buttons">
<var:if condition="canCreateOrModify"
><a class="button actionButton" name="submit" id="submitButton">
<span><var:string label:value="Save" /></span>
</a></var:if>
<a id="cancelButton" class="button" name="cancel">
<span><var:string label:value="Cancel"/></span>
</a>
</div>
</form>
</var:component>

6
UI/WebServerResources/UIxContactEditor.css
View File

@ -18,6 +18,12 @@ TR
{ width: 100% !important;
border: 2px solid #0ff; }
DIV#editorTabs
{ position: absolute;
left: 5px;
right: 5px;
bottom: 40px; }
DIV#editorTabs DIV.tab TD.titleCell
{ text-align: left;
font-weight: bold; }

7
UI/WebServerResources/UIxContactEditor.js
View File

@ -1,7 +1,8 @@
/* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* -*- Mode: java; tab-width: 2; c-label-minimum-indentation: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Copyright (C) 2005 SKYRIX Software AG
Copyright (C) 2006-2010 Inverse
This file is part of OpenGroupware.org.
@ -138,6 +139,10 @@ function onEditorSubmitClick(event) {
}
function initEditorForm() {
var tabsContainer = $("editorTabs");
var controller = new SOGoTabsController();
controller.attachToTabsContainer(tabsContainer);
displayNameChanged = ($("fn").value.length > 0);
$("fn").onkeydown = onFnKeyDown;
$("sn").onkeyup = onFnNewValue;