Various minor Web interface improvements.
Monotone-Parent: de57fd5034fd57e2302198e4d6b342a30830430a Monotone-Revision: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-07-10T15:26:00maint-2.0.2
parent
1459f43f04
commit
3a748792db
|
@ -73,10 +73,10 @@
|
||||||
value = [NSString stringWithFormat: @"<a href=\"%@:%@\">%@</a>", url, value, value];
|
value = [NSString stringWithFormat: @"<a href=\"%@:%@\">%@</a>", url, value, value];
|
||||||
|
|
||||||
if (label)
|
if (label)
|
||||||
[cardString appendFormat: @"%@ %@<br />\n",
|
[cardString appendFormat: @"<dt>%@</dt><dd>%@</dd>\n",
|
||||||
[self labelForKey: label], value];
|
[self labelForKey: label], value];
|
||||||
else
|
else
|
||||||
[cardString appendFormat: @"%@<br />\n", value];
|
[cardString appendFormat: @"<dt></dt><dd>%@</dd>\n", value];
|
||||||
}
|
}
|
||||||
|
|
||||||
return cardString;
|
return cardString;
|
||||||
|
@ -196,14 +196,14 @@
|
||||||
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
|
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
|
||||||
@" onclick=\"return openMailTo('%@ <%@>');\">"
|
@" onclick=\"return openMailTo('%@ <%@>');\">"
|
||||||
@"%@</a>", email, fn, email, email];
|
@"%@</a>", email, fn, email, email];
|
||||||
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
|
[secondaryEmails addObject: [self _cardStringWithLabel: nil
|
||||||
value: mailTo]];
|
value: mailTo]];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
|
[secondaryEmails addObject: [self _cardStringWithLabel: nil
|
||||||
value: mailTo]];
|
value: mailTo]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -575,7 +575,7 @@
|
||||||
data = [NSMutableString string];
|
data = [NSMutableString string];
|
||||||
[data appendString: city];
|
[data appendString: city];
|
||||||
if ([city length] > 0 && [prov length] > 0)
|
if ([city length] > 0 && [prov length] > 0)
|
||||||
[data appendString: @", "];
|
[data appendString: @" "];
|
||||||
[data appendString: prov];
|
[data appendString: prov];
|
||||||
|
|
||||||
return [self _cardStringWithLabel: nil value: data];
|
return [self _cardStringWithLabel: nil value: data];
|
||||||
|
@ -592,7 +592,7 @@
|
||||||
data = [NSMutableString string];
|
data = [NSMutableString string];
|
||||||
[data appendString: postalCode];
|
[data appendString: postalCode];
|
||||||
if ([postalCode length] > 0 && [country length] > 0)
|
if ([postalCode length] > 0 && [country length] > 0)
|
||||||
[data appendFormat: @", ", country];
|
[data appendFormat: @" ", country];
|
||||||
[data appendString: country];
|
[data appendString: country];
|
||||||
|
|
||||||
return [self _cardStringWithLabel: nil value: data];
|
return [self _cardStringWithLabel: nil value: data];
|
||||||
|
|
|
@ -8,72 +8,80 @@
|
||||||
xmlns:uix="OGo:uix">
|
xmlns:uix="OGo:uix">
|
||||||
|
|
||||||
<var:if condition="hasPhoto"
|
<var:if condition="hasPhoto"
|
||||||
><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"
|
><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"/></span></var:if>
|
||||||
/></span></var:if>
|
|
||||||
|
|
||||||
<h3 class="contactCardTitle"><var:string value="fullName" /></h3
|
<h3 class="contactCardTitle"><var:string value="fullName" /></h3>
|
||||||
|
<div id="leftContactColumn" class="contactColumn">
|
||||||
><div id="leftContactColumn" class="contactColumn"
|
<div id="primaryInfos">
|
||||||
><div id="primaryInfos"
|
<h4><var:string label:value="Contact" /></h4>
|
||||||
><h4><var:string label:value="Contact" /></h4
|
<dl class="dl-horizontal">
|
||||||
><var:string value="displayName" escapeHTML="NO"
|
<var:string value="displayName" escapeHTML="NO"
|
||||||
/><var:string value="nickName" escapeHTML="NO"
|
/><var:string value="nickName" escapeHTML="NO"
|
||||||
/><var:string value="primaryEmail" escapeHTML="NO"
|
/><var:string value="primaryEmail" escapeHTML="NO"
|
||||||
/><var:foreach list="secondaryEmails" item="currentEmail">
|
/><var:foreach list="secondaryEmails" item="currentEmail">
|
||||||
<var:string value="currentEmail" escapeHTML="NO"/>
|
<var:string value="currentEmail" escapeHTML="NO"/>
|
||||||
</var:foreach>
|
</var:foreach
|
||||||
<var:string value="screenName" escapeHTML="NO"
|
><var:string value="screenName" escapeHTML="NO"
|
||||||
/><var:string value="preferredAddress" escapeHTML="NO"
|
/><var:string value="preferredAddress" escapeHTML="NO"
|
||||||
/><var:string value="categories" escapeHTML="NO"
|
/><var:string value="categories" escapeHTML="NO"
|
||||||
/></div
|
/>
|
||||||
>
|
</dl>
|
||||||
<var:if condition="hasHomeInfos"
|
</div>
|
||||||
><div id="homeInfos"
|
|
||||||
><h4><var:string label:value="Home" /></h4
|
|
||||||
><var:string value="homeStreetAddress" escapeHTML="NO"
|
|
||||||
/><var:string value="homeExtendedAddress" escapeHTML="NO"
|
|
||||||
/><var:string value="homePobox" escapeHTML="NO"
|
|
||||||
/><var:string value="homeCityAndProv" escapeHTML="NO"
|
|
||||||
/><var:string value="homePostalCodeAndCountry" escapeHTML="NO"
|
|
||||||
/><var:string value="homeUrl" escapeHTML="NO"
|
|
||||||
/></div
|
|
||||||
></var:if
|
|
||||||
|
|
||||||
><var:if condition="hasOtherInfos"
|
<var:if condition="hasHomeInfos"
|
||||||
><div id="otherInfos"
|
><div id="homeInfos">
|
||||||
><h4><var:string label:value="Other Infos" /></h4
|
<h4><var:string label:value="Home" /></h4>
|
||||||
><var:string value="bday" escapeHTML="NO"
|
<dl class="dl-horizontal">
|
||||||
/><var:string value="tz" escapeHTML="NO"
|
<var:string value="homeStreetAddress" escapeHTML="NO"
|
||||||
/><var:string value="note" escapeHTML="NO"
|
/><var:string value="homeExtendedAddress" escapeHTML="NO"
|
||||||
/></div
|
/><var:string value="homePobox" escapeHTML="NO"
|
||||||
></var:if
|
/><var:string value="homeCityAndProv" escapeHTML="NO"
|
||||||
></div
|
/><var:string value="homePostalCodeAndCountry" escapeHTML="NO"
|
||||||
|
/><var:string value="homeUrl" escapeHTML="NO"
|
||||||
|
/>
|
||||||
|
</dl>
|
||||||
|
</div></var:if
|
||||||
|
|
||||||
><div id="rightContactColumn" class="contactColumn"
|
><var:if condition="hasOtherInfos"
|
||||||
><var:if condition="hasTelephones"
|
><div id="otherInfos">
|
||||||
><div id="phoneInfos"
|
<h4><var:string label:value="Other Infos" /></h4>
|
||||||
><h4><var:string label:value="Telephone" /></h4
|
<dl class="dl-horizontal">
|
||||||
><var:string value="workPhone" escapeHTML="NO"
|
<var:string value="bday" escapeHTML="NO"
|
||||||
/><var:string value="homePhone" escapeHTML="NO"
|
/><var:string value="tz" escapeHTML="NO"
|
||||||
/><var:string value="fax" escapeHTML="NO"
|
/><var:string value="note" escapeHTML="NO"
|
||||||
/><var:string value="mobile" escapeHTML="NO"
|
/>
|
||||||
/><var:string value="pager" escapeHTML="NO"
|
</dl>
|
||||||
/></div
|
</div></var:if
|
||||||
></var:if
|
></div>
|
||||||
|
<div id="rightContactColumn" class="contactColumn">
|
||||||
|
<var:if condition="hasTelephones"
|
||||||
|
><div id="phoneInfos">
|
||||||
|
<h4><var:string label:value="Telephone" /></h4>
|
||||||
|
<dl class="dl-horizontal">
|
||||||
|
<var:string value="workPhone" escapeHTML="NO"
|
||||||
|
/><var:string value="homePhone" escapeHTML="NO"
|
||||||
|
/><var:string value="fax" escapeHTML="NO"
|
||||||
|
/><var:string value="mobile" escapeHTML="NO"
|
||||||
|
/><var:string value="pager" escapeHTML="NO"
|
||||||
|
/>
|
||||||
|
</dl>
|
||||||
|
</div></var:if
|
||||||
|
|
||||||
><var:if condition="hasWorkInfos"
|
><var:if condition="hasWorkInfos"
|
||||||
><div id="workInfos"
|
><div id="workInfos">
|
||||||
><h4><var:string label:value="Work" /></h4
|
<h4><var:string label:value="Work" /></h4>
|
||||||
><var:string value="workTitle" escapeHTML="NO"
|
<dl class="dl-horizontal">
|
||||||
/><var:string value="workService" escapeHTML="NO"
|
<var:string value="workTitle" escapeHTML="NO"
|
||||||
/><var:string value="workCompany" escapeHTML="NO"
|
/><var:string value="workService" escapeHTML="NO"
|
||||||
/><var:string value="workPobox" escapeHTML="NO"
|
/><var:string value="workCompany" escapeHTML="NO"
|
||||||
/><var:string value="workStreetAddress" escapeHTML="NO"
|
/><var:string value="workPobox" escapeHTML="NO"
|
||||||
/><var:string value="workExtendedAddress" escapeHTML="NO"
|
/><var:string value="workStreetAddress" escapeHTML="NO"
|
||||||
/><var:string value="workCityAndProv" escapeHTML="NO"
|
/><var:string value="workExtendedAddress" escapeHTML="NO"
|
||||||
/><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
|
/><var:string value="workCityAndProv" escapeHTML="NO"
|
||||||
/><var:string value="workUrl" escapeHTML="NO"
|
/><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
|
||||||
/></div
|
/><var:string value="workUrl" escapeHTML="NO"
|
||||||
></var:if
|
/>
|
||||||
></div
|
</dl>
|
||||||
></container>
|
</div></var:if
|
||||||
|
></div
|
||||||
|
></container>
|
||||||
|
|
|
@ -11,18 +11,24 @@
|
||||||
const:popup="YES"
|
const:popup="YES"
|
||||||
>
|
>
|
||||||
<h3 class="contactCardTitle"><var:string value="listName" /></h3>
|
<h3 class="contactCardTitle"><var:string value="listName" /></h3>
|
||||||
<var:if condition="hasNickname">
|
<div class="contactColumn">
|
||||||
<h4><var:string value="listNickname" /></h4>
|
<dl class="dl-horizontal">
|
||||||
</var:if>
|
<dt><var:if condition="hasNickname"><var:string value="listNickname" /></var:if></dt>
|
||||||
<var:if condition="hasDescription">
|
<dd><var:if condition="hasDescription"><var:string value="listDescription" /></var:if></dd>
|
||||||
<div class="listDescription"><var:string value="listDescription" /></div>
|
</dl>
|
||||||
</var:if>
|
<h4><var:string label:value="Members" /></h4>
|
||||||
<ul class="listComponents">
|
<dl class="dl-horizontal">
|
||||||
<var:foreach list="components" item="item">
|
<dt></dt>
|
||||||
<li><var:string var:value="itemName"/>
|
<dd>
|
||||||
<var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
|
<ul class="listComponents">
|
||||||
|
<var:foreach list="components" item="item">
|
||||||
|
<li><var:string var:value="itemName"/>
|
||||||
|
<var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
|
||||||
<<var:string var:value="itemEmail"/>></a></var:if>
|
<<var:string var:value="itemEmail"/>></a></var:if>
|
||||||
</li>
|
</li>
|
||||||
</var:foreach>
|
</var:foreach
|
||||||
</ul>
|
></ul>
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
</var:component>
|
</var:component>
|
||||||
|
|
|
@ -118,11 +118,13 @@
|
||||||
><input type="checkbox" const:class="checkBox"
|
><input type="checkbox" const:class="checkBox"
|
||||||
id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
|
id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
|
||||||
/><var:string label:value="When I modify my calendar, send a mail to:"
|
/><var:string label:value="When I modify my calendar, send a mail to:"
|
||||||
/></label><span class="content"><input type="text"
|
/></label></div>
|
||||||
name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
|
<div><span class="label"
|
||||||
class="textField"
|
><entity name="nbsp"/></span><span class="content">
|
||||||
var:value="notifiedUserOnPersonalModifications"
|
<input type="text" name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
|
||||||
/></span></div>
|
class="textField"
|
||||||
|
var:value="notifiedUserOnPersonalModifications"
|
||||||
|
/></span></div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -279,6 +279,38 @@ DIV.contactColumn H4
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: .1em .2em; }
|
padding: .1em .2em; }
|
||||||
|
|
||||||
|
dt, dd {
|
||||||
|
line-height: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
dt {
|
||||||
|
color: #666;
|
||||||
|
line-height: 13px;
|
||||||
|
}
|
||||||
|
dd {
|
||||||
|
margin-left: 9px;
|
||||||
|
}
|
||||||
|
.dl-horizontal dt {
|
||||||
|
float: left;
|
||||||
|
width: 100px;
|
||||||
|
overflow: hidden;
|
||||||
|
clear: left;
|
||||||
|
text-align: right;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.dl-horizontal dd {
|
||||||
|
margin-left: 110px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dl-horizontal ul {
|
||||||
|
list-style-type: none;
|
||||||
|
margin: 0px;
|
||||||
|
padding-left: 0px;
|
||||||
|
}
|
||||||
|
.dl-horizontal li {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
SPAN.photoFrame
|
SPAN.photoFrame
|
||||||
{ cursor: pointer;
|
{ cursor: pointer;
|
||||||
float: left;
|
float: left;
|
||||||
|
|
|
@ -1293,8 +1293,10 @@ DIV.event > DIV.eventInside
|
||||||
padding: 1px;
|
padding: 1px;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
left: 0px;
|
left: 2px;
|
||||||
right: 0px; }
|
right: 1px;
|
||||||
|
-webkit-border-radius: 2px;
|
||||||
|
border-radius: 2px; }
|
||||||
|
|
||||||
DIV.eventInside SPAN.location
|
DIV.eventInside SPAN.location
|
||||||
{ font-size: smaller; }
|
{ font-size: smaller; }
|
||||||
|
|
|
@ -13,19 +13,20 @@ FIELDSET DIV
|
||||||
|
|
||||||
SPAN.label
|
SPAN.label
|
||||||
{ cursor: default;
|
{ cursor: default;
|
||||||
width: 60px;
|
width: 55px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
line-height: 2em;
|
line-height: 2em;
|
||||||
float: left;
|
float: left;
|
||||||
display: block; }
|
display: block; }
|
||||||
|
|
||||||
INPUT.checkBox
|
INPUT.checkBox
|
||||||
{ margin-left: 35px; }
|
{ margin-left: 38px;
|
||||||
|
margin-right: 6px; }
|
||||||
|
|
||||||
SPAN.content
|
SPAN.content
|
||||||
{ display: block;
|
{ line-height: 1.5em;
|
||||||
line-height: 1.5em;
|
vertical-align: middle;
|
||||||
vertical-align: middle; }
|
margin-left: 4px; }
|
||||||
|
|
||||||
SPAN.content INPUT.textField
|
SPAN.content INPUT.textField
|
||||||
{ width: 160px; }
|
{ width: 160px; }
|
||||||
|
|
Loading…
Reference in New Issue