reindentation

Monotone-Parent: fa0e0e52e3edf5ac1db31482d112cad2937c4b74
Monotone-Revision: 7521d8d099b3de615206540af220cd63c8c65dde

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-22T15:12:42
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-02-22 15:12:42 +00:00
parent a1cd03457c
commit 1d3269fe91
2 changed files with 171 additions and 168 deletions

View file

@ -18,38 +18,38 @@
<li target="generalView"><span> <li target="generalView"><span>
<var:string label:value="General" /></span></li> <var:string label:value="General" /></span></li>
<var:if condition="userHasCalendarAccess"> <var:if condition="userHasCalendarAccess">
<li target="calendarOptionsView"><span><var:string <li target="calendarOptionsView"><span><var:string
label:value="Calendar Options"/></span></li> label:value="Calendar Options"/></span></li>
</var:if> </var:if>
<var:if condition="userHasMailAccess"> <var:if condition="userHasMailAccess">
<li target="mailOptionsView"><span><var:string <li target="mailOptionsView"><span><var:string
label:value="Mail Options"/></span></li> label:value="Mail Options"/></span></li>
<li target="identitiesView"><span><var:string <li target="identitiesView"><span><var:string
label:value="Signature"/></span></li> label:value="Signature"/></span></li>
<var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string <var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string
label:value="Vacation"/></span></li></var:if> label:value="Vacation"/></span></li></var:if>
<var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string <var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
label:value="Forward"/></span></li></var:if> label:value="Forward"/></span></li></var:if>
</var:if> </var:if>
<var:if condition="shouldDisplayAdditionalPreferences"> <var:if condition="shouldDisplayAdditionalPreferences">
<li target="additionalView"><span> <li target="additionalView"><span>
<var:string label:value="Additional Parameters"/></span></li> <var:string label:value="Additional Parameters"/></span></li>
</var:if> </var:if>
<!-- <var:if condition="shouldDisplayPasswordChange"> --> <!-- <var:if condition="shouldDisplayPasswordChange"> -->
<!-- <li target="passwordView"><var:string label:value="Password"/></li> --> <!-- <li target="passwordView"><var:string label:value="Password"/></li> -->
<!-- </var:if> --> <!-- </var:if> -->
</ul> </ul>
<div id="generalView" class="tab"> <div id="generalView" class="tab">
<label><var:string label:value="Language :"/> <label><var:string label:value="Language :"/>
<var:popup list="languages" item="item" <var:popup list="languages" item="item"
const:id="language" const:id="language"
string="languageText" string="languageText"
selection="language" selection="language"
label:noSelectionString="choose" /></label><br/> label:noSelectionString="choose" /></label><br/>
<label><var:string label:value="Current Time Zone :"/> <label><var:string label:value="Current Time Zone :"/>
<var:popup list="timeZonesList" item="item" <var:popup list="timeZonesList" item="item"
const:id="timezone" const:id="timezone"
string="item" selection="userTimeZone" /></label><br/> string="item" selection="userTimeZone" /></label><br/>
<br/> <br/>
<div id="dateTimeFormat"> <div id="dateTimeFormat">
<label><var:string label:value="Short Date Format :"/> <label><var:string label:value="Short Date Format :"/>
@ -66,12 +66,12 @@
<var:popup list="timeFormatsList" item="item" <var:popup list="timeFormatsList" item="item"
const:id="timeFormat" const:id="timeFormat"
string="itemTimeFormatText" selection="userTimeFormat" string="itemTimeFormatText" selection="userTimeFormat"
/></label><br/> /></label><br/>
<label><var:string label:value="Default module :"/> <label><var:string label:value="Default module :"/>
<var:popup list="availableModules" item="item" <var:popup list="availableModules" item="item"
const:id="defaultModule" const:id="defaultModule"
string="itemModuleText" selection="userDefaultModule" string="itemModuleText" selection="userDefaultModule"
/></label> /></label>
</div> </div>
</div> </div>
<var:if condition="userHasCalendarAccess"> <var:if condition="userHasCalendarAccess">
@ -96,59 +96,59 @@
const:id="firstWeek" const:id="firstWeek"
string="itemFirstWeekText" selection="userFirstWeek" string="itemFirstWeekText" selection="userFirstWeek"
/></label><br/> /></label><br/>
<label><var:string label:value="Categories"/></label> <label><var:string label:value="Categories"/></label>
<div id="categoriesListWrapper" <div id="categoriesListWrapper"
><table id="categoriesList" cellspacing="0"> ><table id="categoriesList" cellspacing="0">
<thead> <thead>
<tr class="tableview" <tr class="tableview"
><td const:class="tbtv_headercell" const:id="nameTableHeader" ><td const:class="tbtv_headercell" const:id="nameTableHeader"
><var:string var:value="nameLabel" /></td ><var:string var:value="nameLabel" /></td
><td const:class="tbtv_headercell" const:width="20%" const:id="colorTableHeader" ><td const:class="tbtv_headercell" const:id="colorTableHeader"
><var:string var:value="colorLabel" /></td ><var:string var:value="colorLabel" /></td
></tr ></tr
></thead> ></thead>
<tbody> <tbody>
<var:foreach list="categoryList" item="category"> <var:foreach list="categoryList" item="category">
<tr const:class="categoryListRow" <tr const:class="categoryListRow"
><td const:class="categoryListCell" ><td const:class="categoryListCell"
><var:string var:value="category"/></td ><var:string var:value="category"/></td
><td const:class="categoryListCell" ><td const:class="categoryListCell"
><div const:class="colorBox"><var:string var:value="categoryColor" ><div const:class="colorBox"><var:string var:value="categoryColor"
/></div></td /></div></td
></tr> ></tr>
</var:foreach> </var:foreach>
</tbody> </tbody>
</table></div> </table></div>
<div class="bottomToolbar"> <div class="bottomToolbar">
<a const:id="categoryAdd" class="bottomButton" href="#"> <a const:id="categoryAdd" class="bottomButton" href="#">
<span><img rsrc:src="add-icon.png" label:title="Add" /> <span><img rsrc:src="add-icon.png" label:title="Add" />
</span></a> </span></a>
<a const:id="categoryDelete" class="bottomButton" href="#"> <a const:id="categoryDelete" class="bottomButton" href="#">
<span><img rsrc:src="remove-icon.png" label:title="Delete" /> <span><img rsrc:src="remove-icon.png" label:title="Delete" />
</span></a> </span></a>
</div> </div>
<input type="hidden" const:id="categoriesValue" <input type="hidden" const:id="categoriesValue"
const:name="categoriesValue" var:value="categoriesValue"/> const:name="categoriesValue" var:value="categoriesValue"/>
<!-- <br/> --> <!-- <br/> -->
<!-- <label><input class="checkBox" --> <!-- <label><input class="checkBox" -->
<!-- type="checkbox" var:selection="reminderEnabled" --> <!-- type="checkbox" var:selection="reminderEnabled" -->
<!-- var:checked="reminderEnabled"/><var:string --> <!-- var:checked="reminderEnabled"/><var:string -->
<!-- label:value="Enable reminders for Calendar items"/></label><br/> --> <!-- label:value="Enable reminders for Calendar items"/></label><br/> -->
<!-- <label><input class="checkBox" --> <!-- <label><input class="checkBox" -->
<!-- type="checkbox" var:selection="remindWithASound" --> <!-- type="checkbox" var:selection="remindWithASound" -->
<!-- var:checked="remindWithASound"/><var:string --> <!-- var:checked="remindWithASound"/><var:string -->
<!-- label:value="Play a sound when a reminder comes due"/></label><br/> --> <!-- label:value="Play a sound when a reminder comes due"/></label><br/> -->
<!-- <label><var:string label:value="Default reminder :"/> --> <!-- <label><var:string label:value="Default reminder :"/> -->
<!-- <var:popup list="reminderTimesList" item="item" --> <!-- <var:popup list="reminderTimesList" item="item" -->
<!-- string="itemReminderTimeText" selection="userReminderTime"/></label> --> <!-- string="itemReminderTimeText" selection="userReminderTime"/></label> -->
</div> </div>
</var:if> </var:if>
<var:if condition="userHasMailAccess"> <var:if condition="userHasMailAccess">
<div id="mailOptionsView" class="tab"> <div id="mailOptionsView" class="tab">
<label><input type="checkbox" <label><input type="checkbox"
const:name="subscribedFoldersOnly" const:name="subscribedFoldersOnly"
const:id="subscribedFoldersOnly" const:id="subscribedFoldersOnly"
var:checked="showSubscribedFoldersOnly" /> var:checked="showSubscribedFoldersOnly" />
<var:string label:value="Show subscribed mailboxes only"/></label><br/> <var:string label:value="Show subscribed mailboxes only"/></label><br/>
<label><var:string label:value="Check for new mail:"/> <label><var:string label:value="Check for new mail:"/>
<var:popup list="messageCheckList" item="item" <var:popup list="messageCheckList" item="item"
@ -160,19 +160,19 @@
string="itemMessageForwardingText" string="itemMessageForwardingText"
selection="userMessageForwarding"/></label><br/> selection="userMessageForwarding"/></label><br/>
<var:popup list="replyPlacementList" item="item" <var:popup list="replyPlacementList" item="item"
const:id="replyPlacementList" const:id="replyPlacementList"
string="itemReplyPlacementText" string="itemReplyPlacementText"
selection="userReplyPlacement"/> selection="userReplyPlacement"/>
<br /><label><var:string label:value="And place my signature"/></label> <br /><label><var:string label:value="And place my signature"/></label>
<var:popup list="signaturePlacementList" item="item" <var:popup list="signaturePlacementList" item="item"
const:id="signaturePlacementList" const:id="signaturePlacementList"
string="itemSignaturePlacementText" string="itemSignaturePlacementText"
selection="userSignaturePlacement"/> selection="userSignaturePlacement"/>
<br /><label><var:string label:value="Compose messages in"/></label> <br /><label><var:string label:value="Compose messages in"/></label>
<var:popup list="composeMessagesType" item="item" <var:popup list="composeMessagesType" item="item"
const:id="composeMessagesType" const:id="composeMessagesType"
string="itemComposeMessagesText" string="itemComposeMessagesText"
selection="userComposeMessagesType"/> selection="userComposeMessagesType"/>
</div> </div>
<div id="identitiesView" class="tab"> <div id="identitiesView" class="tab">
<!--<var:multiselection const:id="identitiesList" item="item" <!--<var:multiselection const:id="identitiesList" item="item"
@ -183,90 +183,90 @@
var:value="signature" /> var:value="signature" />
</div> </div>
<var:if condition="isVacationEnabled"> <var:if condition="isVacationEnabled">
<div id="vacationView" class="tab"> <div id="vacationView" class="tab">
<label><input type="checkbox" <label><input type="checkbox"
const:name="enableVacation" const:name="enableVacation"
const:id="enableVacation" const:id="enableVacation"
var:checked="enableVacation" /> var:checked="enableVacation" />
<var:string label:value="Enable vacation auto reply"/></label> <var:string label:value="Enable vacation auto reply"/></label>
<div id="vacation"> <div id="vacation">
<label><var:string label:value="Auto reply message :"/><br/> <label><var:string label:value="Auto reply message :"/><br/>
<textarea const:name="autoReplyText" <textarea const:name="autoReplyText"
const:id="autoReplyText" const:id="autoReplyText"
var:value="autoReplyText"/> var:value="autoReplyText"/>
</label><br/> </label><br/>
<label><var:string label:value="Email addresses (separated by commas) :"/><br/> <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
<input type="hidden" <input type="hidden"
const:id="defaultEmailAddresses" const:id="defaultEmailAddresses"
var:value="defaultEmailAddresses" /> var:value="defaultEmailAddresses" />
<textarea const:name="autoReplyEmailAddresses" <textarea const:name="autoReplyEmailAddresses"
const:id="autoReplyEmailAddresses" const:id="autoReplyEmailAddresses"
var:value="autoReplyEmailAddresses" /><br/> var:value="autoReplyEmailAddresses" /><br/>
<span><a href="#" class="button" id="addDefaultEmailAddresses"><span> <span><a href="#" class="button" id="addDefaultEmailAddresses"><span>
<var:string label:value="Add default email addresses" /></span></a> <var:string label:value="Add default email addresses" /></span></a>
</span> </span>
</label><br/> </label><br/>
<label><var:string label:value="Days between responses :"/> <label><var:string label:value="Days between responses :"/>
<var:popup list="daysBetweenResponsesList" item="item" <var:popup list="daysBetweenResponsesList" item="item"
const:id="daysBetweenResponsesList" const:id="daysBetweenResponsesList"
string="item" string="item"
selection="daysBetweenResponses" /></label><br/> selection="daysBetweenResponses" /></label><br/>
<label><input type="checkbox" <label><input type="checkbox"
const:name="ignoreLists" const:name="ignoreLists"
const:id="ignoreLists" const:id="ignoreLists"
var:checked="ignoreLists" /> var:checked="ignoreLists" />
<var:string label:value="Do not send responses to mailing lists" /></label><br/> <var:string label:value="Do not send responses to mailing lists" /></label><br/>
</div> </div>
</div> </div>
</var:if> </var:if>
<var:if condition="isForwardEnabled"> <var:if condition="isForwardEnabled">
<div id="forwardView" class="tab"> <div id="forwardView" class="tab">
<label><input type="checkbox" <label><input type="checkbox"
const:name="enableForward" const:name="enableForward"
const:id="enableForward" const:id="enableForward"
var:checked="enableForward" /> var:checked="enableForward" />
<var:string label:value="Forward incoming messages"/></label><br/> <var:string label:value="Forward incoming messages"/></label><br/>
<div id="forward"> <div id="forward">
<label><var:string label:value="Forward to address :"/> <label><var:string label:value="Forward to address :"/>
<input type="text" <input type="text"
const:id="forwardAddress" const:id="forwardAddress"
const:name="forwardAddress" const:name="forwardAddress"
var:value="forwardAddress" var:value="forwardAddress"
size="30" /></label><br/> size="30" /></label><br/>
<label><input type="checkbox" <label><input type="checkbox"
const:name="forwardKeepCopy" const:name="forwardKeepCopy"
const:id="forwardKeepCopy" const:id="forwardKeepCopy"
var:checked="forwardKeepCopy" /> var:checked="forwardKeepCopy" />
<var:string label:value="Keep a copy" /></label><br/> <var:string label:value="Keep a copy" /></label><br/>
</div> </div>
</div> </div>
</var:if> </var:if>
</var:if> </var:if>
<var:if condition="shouldDisplayAdditionalPreferences" <var:if condition="shouldDisplayAdditionalPreferences"
><div id="additionalView" class="tab"> ><div id="additionalView" class="tab">
<var:component className="UIxAdditionalPreferences"/> <var:component className="UIxAdditionalPreferences"/>
</div></var:if> </div></var:if>
<!-- <var:if condition="shouldDisplayPasswordChange"> --> <!-- <var:if condition="shouldDisplayPasswordChange"> -->
<!-- <div id="passwordView" class="tab"> --> <!-- <div id="passwordView" class="tab"> -->
<!-- <label><var:string label:value="New password:" --> <!-- <label><var:string label:value="New password:" -->
<!-- /><input type="text" class="textField" --> <!-- /><input type="text" class="textField" -->
<!-- const:enabled="disabled" --> <!-- const:enabled="disabled" -->
<!-- var:value="newPassword"/></label><br/> --> <!-- var:value="newPassword"/></label><br/> -->
<!-- <label><var:string label:value="Confirmation:" --> <!-- <label><var:string label:value="Confirmation:" -->
<!-- /><input type="text" class="textField" --> <!-- /><input type="text" class="textField" -->
<!-- const:enabled="disabled" --> <!-- const:enabled="disabled" -->
<!-- var:value="newPasswordConfirmation"/></label><br/> --> <!-- var:value="newPasswordConfirmation"/></label><br/> -->
<!-- <input type="button" class="button" --> <!-- <input type="button" class="button" -->
<!-- id="changePasswordBtn" label:value="Change"/> --> <!-- id="changePasswordBtn" label:value="Change"/> -->
<!-- </div> --> <!-- </div> -->
<!-- </var:if> --> <!-- </var:if> -->
<input type="hidden" id="hasChanged" name="hasChanged" <input type="hidden" id="hasChanged" name="hasChanged"
var:value="hasChanged"/> var:value="hasChanged"/>
</div> </div>

View file

@ -34,9 +34,6 @@ TEXTAREA#signature
height: 345px; height: 345px;
width: 415px;} width: 415px;}
TABLE#categoriesList
{ width: 100%; }
DIV#categoriesListWrapper DIV#categoriesListWrapper
{ overflow: auto; { overflow: auto;
position: absolute; position: absolute;
@ -46,8 +43,21 @@ DIV#categoriesListWrapper
left: 2em; left: 2em;
padding: 0px; padding: 0px;
margin-top: 2px; margin-top: 2px;
border-left: 1px solid #9B9B9B; border-left: 1px solid #9b9b9b;
background: #CCDDEC; } background: #ccddec; }
TABLE#categoriesList
{ width: 100%; }
#colorTableHeader
{ width: 40px; }
TR.categoryListRow
{ background: #ccddec;
cursor: pointer; }
TD.categoryListCell
{ -moz-user-select: none; }
DIV.colorBox DIV.colorBox
{ border: 1px solid #333333; { border: 1px solid #333333;
@ -57,13 +67,6 @@ DIV.colorBox
margin: 0 3px 0 0; margin: 0 3px 0 0;
width: 1em; } width: 1em; }
TR.categoryListRow
{ background: #CCDDEC;
cursor: pointer; }
TD.categoryListCell
{ -moz-user-select: none; }
DIV#windowButtons DIV#windowButtons
{ position: fixed; { position: fixed;
bottom: 20px; bottom: 20px;