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

Various minor Web interface improvements. 

Monotone-Parent: de57fd5034fd57e2302198e4d6b342a30830430a
Monotone-Revision: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-10T15:26:00
maint-2.0.2
Francis Lachapelle 2012-07-10 15:26:00 +00:00
parent 1459f43f04
commit 3a748792db
7 changed files with 143 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/Contacts/UIxContactView.m
View File

@ -73,10 +73,10 @@
value = [NSString stringWithFormat: @"<a href=\"%@:%@\">%@</a>", url, value, value];
if (label)
[cardString appendFormat: @"%@&nbsp;%@<br />\n",
[cardString appendFormat: @"<dt>%@</dt><dd>%@</dd>\n",
[self labelForKey: label], value];
else
[cardString appendFormat: @"%@<br />\n", value];
[cardString appendFormat: @"<dt></dt><dd>%@</dd>\n", value];
}
return cardString;
@ -196,14 +196,14 @@
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, fn, email, email];
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
[secondaryEmails addObject: [self _cardStringWithLabel: nil
value: mailTo]];
}
}
}
else
{
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
[secondaryEmails addObject: [self _cardStringWithLabel: nil
value: mailTo]];
}
@ -575,7 +575,7 @@
data = [NSMutableString string];
[data appendString: city];
if ([city length] > 0 && [prov length] > 0)
[data appendString: @", "];
[data appendString: @" "];
[data appendString: prov];
return [self _cardStringWithLabel: nil value: data];
@ -592,7 +592,7 @@
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
[data appendFormat: @", ", country];
[data appendFormat: @" ", country];
[data appendString: country];
return [self _cardStringWithLabel: nil value: data];

130
UI/Templates/ContactsUI/UIxContactView.wox
View File

@ -8,72 +8,80 @@
xmlns:uix="OGo:uix">
<var:if condition="hasPhoto"
><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"
/></span></var:if>
><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"/></span></var:if>
<h3 class="contactCardTitle"><var:string value="fullName" /></h3
><div id="leftContactColumn" class="contactColumn"
><div id="primaryInfos"
><h4><var:string label:value="Contact" /></h4
><var:string value="displayName" escapeHTML="NO"
<h3 class="contactCardTitle"><var:string value="fullName" /></h3>
<div id="leftContactColumn" class="contactColumn">
<div id="primaryInfos">
<h4><var:string label:value="Contact" /></h4>
<dl class="dl-horizontal">
<var:string value="displayName" escapeHTML="NO"
/><var:string value="nickName" escapeHTML="NO"
/><var:string value="primaryEmail" escapeHTML="NO"
/><var:foreach list="secondaryEmails" item="currentEmail">
<var:string value="currentEmail" escapeHTML="NO"/>
</var:foreach>
<var:string value="screenName" escapeHTML="NO"
<var:string value="currentEmail" escapeHTML="NO"/>
</var:foreach
><var:string value="screenName" escapeHTML="NO"
/><var:string value="preferredAddress" escapeHTML="NO"
/><var:string value="categories" escapeHTML="NO"
/></div
>
<var:if condition="hasHomeInfos"
><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"
><div id="otherInfos"
><h4><var:string label:value="Other Infos" /></h4
><var:string value="bday" escapeHTML="NO"
/><var:string value="tz" escapeHTML="NO"
/><var:string value="note" escapeHTML="NO"
/></div
></var:if
></div
/>
</dl>
</div>
><div id="rightContactColumn" class="contactColumn"
><var:if condition="hasTelephones"
><div id="phoneInfos"
><h4><var:string label:value="Telephone" /></h4
><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"
/></div
></var:if
<var:if condition="hasHomeInfos"
><div id="homeInfos">
<h4><var:string label:value="Home" /></h4>
<dl class="dl-horizontal">
<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"
/>
</dl>
</div></var:if
><var:if condition="hasOtherInfos"
><div id="otherInfos">
<h4><var:string label:value="Other Infos" /></h4>
<dl class="dl-horizontal">
<var:string value="bday" escapeHTML="NO"
/><var:string value="tz" escapeHTML="NO"
/><var:string value="note" escapeHTML="NO"
/>
</dl>
</div></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"
><div id="workInfos"
><h4><var:string label:value="Work" /></h4
><var:string value="workTitle" escapeHTML="NO"
/><var:string value="workService" escapeHTML="NO"
/><var:string value="workCompany" escapeHTML="NO"
/><var:string value="workPobox" escapeHTML="NO"
/><var:string value="workStreetAddress" escapeHTML="NO"
/><var:string value="workExtendedAddress" escapeHTML="NO"
/><var:string value="workCityAndProv" escapeHTML="NO"
/><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
/><var:string value="workUrl" escapeHTML="NO"
/></div
></var:if
></div
></container>
><var:if condition="hasWorkInfos"
><div id="workInfos">
<h4><var:string label:value="Work" /></h4>
<dl class="dl-horizontal">
<var:string value="workTitle" escapeHTML="NO"
/><var:string value="workService" escapeHTML="NO"
/><var:string value="workCompany" escapeHTML="NO"
/><var:string value="workPobox" escapeHTML="NO"
/><var:string value="workStreetAddress" escapeHTML="NO"
/><var:string value="workExtendedAddress" escapeHTML="NO"
/><var:string value="workCityAndProv" escapeHTML="NO"
/><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
/><var:string value="workUrl" escapeHTML="NO"
/>
</dl>
</div></var:if
></div
></container>

32
UI/Templates/ContactsUI/UIxListView.wox
View File

@ -11,18 +11,24 @@
const:popup="YES"
>
<h3 class="contactCardTitle"><var:string value="listName" /></h3>
<var:if condition="hasNickname">
<h4><var:string value="listNickname" /></h4>
</var:if>
<var:if condition="hasDescription">
<div class="listDescription"><var:string value="listDescription" /></div>
</var:if>
<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">
<div class="contactColumn">
<dl class="dl-horizontal">
<dt><var:if condition="hasNickname"><var:string value="listNickname" /></var:if></dt>
<dd><var:if condition="hasDescription"><var:string value="listDescription" /></var:if></dd>
</dl>
<h4><var:string label:value="Members" /></h4>
<dl class="dl-horizontal">
<dt></dt>
<dd>
<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">
&lt;<var:string var:value="itemEmail"/>&gt;</a></var:if>
</li>
</var:foreach>
</ul>
</li>
</var:foreach
></ul>
</dd>
</dl>
</div>
</var:component>

12
UI/Templates/SchedulerUI/UIxCalendarProperties.wox
View File

@ -118,11 +118,13 @@
><input type="checkbox" const:class="checkBox"
id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
/><var:string label:value="When I modify my calendar, send a mail to:"
/></label><span class="content"><input type="text"
name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
class="textField"
var:value="notifiedUserOnPersonalModifications"
/></span></div>
/></label></div>
<div><span class="label"
><entity name="nbsp"/></span><span class="content">
<input type="text" name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
class="textField"
var:value="notifiedUserOnPersonalModifications"
/></span></div>
</fieldset>
</div>

32
UI/WebServerResources/ContactsUI.css
View File

@ -279,6 +279,38 @@ DIV.contactColumn H4
width: 100%;
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
{ cursor: pointer;
float: left;

6
UI/WebServerResources/SchedulerUI.css
View File

@ -1293,8 +1293,10 @@ DIV.event > DIV.eventInside
padding: 1px;
top: 0px;
bottom: 0px;
left: 0px;
right: 0px; }
left: 2px;
right: 1px;
-webkit-border-radius: 2px;
border-radius: 2px; }
DIV.eventInside SPAN.location
{ font-size: smaller; }

11
UI/WebServerResources/UIxCalendarProperties.css
View File

@ -13,19 +13,20 @@ FIELDSET DIV
SPAN.label
{ cursor: default;
width: 60px;
width: 55px;
text-align: right;
line-height: 2em;
float: left;
display: block; }
INPUT.checkBox
{ margin-left: 35px; }
{ margin-left: 38px;
margin-right: 6px; }
SPAN.content
{ display: block;
line-height: 1.5em;
vertical-align: middle; }
{ line-height: 1.5em;
vertical-align: middle;
margin-left: 4px; }
SPAN.content INPUT.textField
{ width: 160px; }