merge of '6159e0c704df2f0a52d5c655b815ae3ef9db304d'

and '9f67c189b2251b9511b4088c2ea0553e82a50502'

Monotone-Parent: 6159e0c704df2f0a52d5c655b815ae3ef9db304d
Monotone-Parent: 9f67c189b2251b9511b4088c2ea0553e82a50502
Monotone-Revision: a08cbc6fd5fb7b2ac306802cada535a59514a495

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-11-25T19:29:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2009-11-25 19:29:21 +00:00
commit ea611566af
2 changed files with 3 additions and 4 deletions

View file

@ -47,6 +47,5 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
</var:foreach>
</ul>
</div>
</div>
</container>

View file

@ -329,10 +329,10 @@
var:value="reminderReference"/>
<div id="windowButtons">
<var:if condition="userIsAttendee"><a id="okButton" href="#" class="button actionButton"
><span><var:string label:value="OK"/></span></a></var:if>
<a id="cancelButton" href="#" class="button"
><var:string label:value="Cancel"/></a>
<var:if condition="userIsAttendee"><a id="okButton" href="#" class="button"
><var:string label:value="OK"/></a></var:if>
><span><var:string label:value="Cancel"/></span></a>
</div>
</div>
</var:if>