Skip to content
GitLab
Commit c8d6d43d authored by Mortier Benoit's avatar Mortier Benoit
Browse files

Merge branch '1.0.12-fixes'

parents 7dbf7c5f bae32ab6
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
View file @ c8d6d43d
.directory
.tx/config
View file @ c8d6d43d
......@@ -2,11 +2,6 @@
host = https://www.transifex.com
type = PO
[FusionDirectory-110.addressbook]
file_filter = addressbook/locale/<lang>/fusiondirectory.po
source_file = addressbook/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-110.alias]
file_filter = alias/locale/<lang>/fusiondirectory.po
source_file = alias/locale/en/fusiondirectory.po
......@@ -27,6 +22,11 @@ file_filter = argonaut/locale/<lang>/fusiondirectory.po
source_file = argonaut/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-110.audit]
file_filter = audit/locale/<lang>/fusiondirectory.po
source_file = audit/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-110.autofs]
file_filter = autofs/locale/<lang>/fusiondirectory.po
source_file = autofs/locale/en/fusiondirectory.po
......@@ -242,6 +242,11 @@ file_filter = systems/locale/<lang>/fusiondirectory.po
source_file = systems/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-110.user-reminder]
file_filter = user-reminder/locale/<lang>/fusiondirectory.po
source_file = user-reminder/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-110.weblink]
file_filter = weblink/locale/<lang>/fusiondirectory.po
source_file = weblink/locale/en/fusiondirectory.po
......
addressbook/addons/addressbook/address_edit.tpl deleted 100644 → 0
View file @ 7dbf7c5f
<table style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" border="0">
<tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
<td align=left width="100%">
<LABEL for="storage_base">
{$storage_info}
</LABEL>
<select id="storage_base" name="storage_base" size="1" title="{t}Choose the department to store entry in{/t}">
{html_options options=$deplist selected=$storage_base}
</select>
</td>
<td>
<a href="{$url}">
X
</a>
</td>
</tr>
<tr style="background-color: white">
<td colspan=2>
<table width="100%">
<tr>
<td style="width:50%; vertical-align:top; background-color: #F0F0F0">
<h2>
<img class="center" alt="" src="{$personal_image}" align=middle>
&nbsp;{t}Personal{/t}
</h2>
<table width="100%">
<tr>
<td>
<LABEL for="sn">
{t}Last name{/t}{$must}
</LABEL>,
<LABEL for="givenName">
{t}First name{/t}{$must}
</LABEL>
</td>
<td>
{render acl=$snACL}
<input type='text' id="sn" name="sn" size=10 maxlength=60 value="{$info_sn}">,
{/render}
{render acl=$givenNameACL}
<input type='text' id="givenName" name="givenName" size=10 maxlength=60 value="{$info_givenName}">
{/render}
<td>
</tr>
<tr>
<td>
<LABEL for="initials">
{t}Initials{/t}
</LABEL>
</td>
<td>
{render acl=$initialsACL}
<input type='text' id="initials" name="initials" size=5 maxlength=20 value="{$info_initials}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="title">
{t}Personal title{/t}
</LABEL>
</td>
<td>
{render acl=$titleACL}
<input type='text' id="title" name="title" size=10 maxlength=20 value="{$info_title}">
{/render}
</td>
</tr>
</table>
</td>
<td style="width:50%; vertical-align:top;background-color:#E8E8E8">
<h2>
<img class="center" alt="" src="{$home_image}" align=middle>
&nbsp;{t}Private{/t}
</h2>
<table width="100%">
<tr>
<td>
<LABEL for="homePostalAddress">
{t}Address{/t}
</LABEL>
<br>
<br>
</td>
<td style="vertical-align:top;">
{render acl=$homePostalAddressACL}
<textarea id="homePostalAddress" name="homePostalAddress" rows=1 cols=20>{$info_homePostalAddress}</textarea>
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="homePhone">
{t}Phone{/t}
</LABEL>
</td>
<td>
{render acl=$homePhoneACL}
<input type='text' id="homePhone" name="homePhone" size=15 maxlength=60 value="{$info_homePhone}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="mobile">
{t}Mobile{/t}
</LABEL>
</td>
<td>
{render acl=$mobileACL}
<input type='text' id="mobile" name="mobile" size=15 maxlength=60 value="{$info_mobile}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="mail">
{t}Email{/t}
</LABEL>
</td>
<td>
{render acl=$mailACL}
<input type='text' id="mail" name="mail" size=15 maxlength=60 value="{$info_mail}">
{/render}
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td style="width:100%; vertical-align:top; background-color: #E4E4E4" colspan=2>
<h2>
<img class="center" alt="" src="{$company_image}" align=middle>
&nbsp;{t}Organizational{/t}
</h2>
<table width="100%">
<tr>
<td>
<table width="100%">
<tr>
<td>
<LABEL for="">
{t}Company{/t}
</LABEL>
</td>
<td>
{render acl=$oACL}
<input type='text' id="o" name="o" size=15 maxlength=60 value="{$info_o}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}Department{/t}
</LABEL>
</td>
<td>
{render acl=$ouACL}
<input type='text' id="ou" name="ou" size=15 maxlength=60 value="{$info_ou}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}City{/t}
</LABEL>
</td>
<td>
{render acl=$lACL}
<input type='text' id="l" name="l" size=15 maxlength=60 value="{$info_l}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}Postal code{/t}
</LABEL>
</td>
<td>
{render acl=$postalCodeACL}
<input type='text' id="postalCode" name="postalCode" size=15 maxlength=60 value="{$info_postalCode}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}Country{/t}
</LABEL>
</td>
<td>
{render acl=$stACL}
<input type='text' id="st" name="st" size=15 maxlength=60 value="{$info_st}">
{/render}
</td>
</tr>
</table>
</td>
<td style="vertical-align:top">
<table width="100%">
<tr>
<td>
<LABEL for="">
{t}Address{/t}
</LABEL>
<br>
<br>
</td>
<td style="vertical-align:top;">
{render acl=$postalAddressACL}
<textarea id="postalAddress" name="postalAddress" rows=1 cols=20 >{$info_postalAddress}</textarea>
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}Phone{/t}
</LABEL>
</td>
<td>
{render acl=$telephoneNumberACL}
<input type='text' id="telephoneNumber" name="telephoneNumber" size=15 maxlength=60 value="{$info_telephoneNumber}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}FAX{/t}
</LABEL>
</td>
<td>
{render acl=$facsimileTelephoneNumberACL}
<input id="facsimileTelephoneNumber" name="facsimileTelephoneNumber"
size=15 maxlength=60 value="{$info_facsimileTelephoneNumber}">
{/render}
</td>
</tr>
<tr>
<td>
<LABEL for="">
{t}Pager{/t}
</LABEL>
</td>
<td>
{render acl=$pagerACL}
<input type='text' id="pager" name="pager" size=15 maxlength=60 value="{$info_pager}">
{/render}
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<p align=right>
<input type="submit" name="save" value="{msgPool type=saveButton}">
<input type="submit" name="cancel" value="{msgPool type=cancelButton}">
</p>
</td>
</tr>
</table>
<!--
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-->
addressbook/addons/addressbook/address_info.tpl deleted 100644 → 0
View file @ 7dbf7c5f
<table style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" border="0">
<tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
<td align=left width="100%">{$storage_info}
</td>
<td>
<a href="{$url}">X</a>
</td>
</tr>
<tr style="background-color: white">
<td colspan=2>
<table width="100%">
<tr>
<td style="width:50%; vertical-align:top; background-color: #F0F0F0">
<h2>
<img class="center" alt="" src="{$personal_image}" align=middle>
{t}Personal{/t}
</h2>
<table summary="" width="100%">
<tr>
<td style='width:40%;'>
{t}Name{/t}
</td>
<td>
<i>{$info_sn}, {$info_givenName}</i>
</td>
</tr>
<tr>
<td>
{t}Initials{/t}
</td>
<td>
<i>{$info_initials}</i>
</td>
</tr>
<tr>
<td>
{t}Personal title{/t}
</td>
<td>
<i>{$info_title}</i>
</td>
</tr>
</table>
</td>
<td style="vertical-align:top; background-color: #E8E8E8">
<h2>
<img class="center" alt="" src="{$home_image}" align=middle>
{t}Private{/t}
</h2>
<table summary="" width="100%">
<tr>
<td style='vertical-align:top; width: 40%;'>
{t}Address{/t}
</td>
<td style="vertical-align:top;">
<i>{$info_homePostalAddress}</i>
</td>
</tr>
<tr>
<td>
{t}Phone{/t}
</td>
<td>
<i>{$info_homePhone}</i>
</td>
</tr>
<tr>
<td>
{t}Mobile{/t}
</td>
<td>
<i>{$info_mobile}</i>
</td>
</tr>
<tr>
<td>
{t}Email{/t}
</td>
<td>
<i><a href="mailto:{$info_givenName}%20{$info_sn}%20%3C{$info_mail}%3E">{$info_mail}</a></i>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td style="vertical-align:top; background-color: #E4E4E4" colspan=2>
<h2>
<img class="center" alt="" src="{$company_image}" align=middle>
{t}Organizational{/t}
</h2>
<table summary="" width="100%">
<tr>
<td width='50%'>
<table summary="" width="100%">
<tr>
<td style='width:40%;'>
{t}Company{/t}
</td>
<td>
<i>{$info_o}</i>
</td>
</tr>
<tr>
<td>
{t}Department{/t}
</td>
<td>
<i>{$info_ou}</i>
</td>
</tr>
<tr>
<td>
{t}City{/t}
</td>
<td>
<i>{$info_l}</i>
</td>
</tr>
<tr>
<td>
{t}Postal code{/t}
</td>
<td>
<i>{$info_postalCode}</i>
</td>
</tr>
<tr>
<td>
{t}Country{/t}
</td>
<td>
<i>{$info_st}</i>
</td>
</tr>
</table>
</td>
<td style="vertical-align:top">
<table summary="" width="100%">
<tr>
<td style='vertical_align:top; width:40%;'>
{t}Address{/t}
</td>
<td style="vertical-align:top;">
<i>{$info_postalAddress}</i>
</td>
</tr>
<tr>
<td>
{t}Phone{/t}
</td>
<td>
<i>{$info_telephoneNumber}</i>
</td>
</tr>
<tr>
<td>
{t}FAX{/t}
</td>
<td>
<i>{$info_facsimileTelephoneNumber}</i>
</td>
</tr>
<tr>
<td>
{t}Pager{/t}
</td>
<td>
<i>{$info_pager}</i>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
addressbook/addons/addressbook/class_addressbook.inc deleted 100644 → 0
View file @ 7dbf7c5f
This diff is collapsed.
addressbook/addons/addressbook/contents.tpl deleted 100644 → 0
View file @ 7dbf7c5f
<table style="table-layout:fixed; width:100%; vertical-align:top; text-align:left; table-layout:auto;" border="0">
<tr>
<td style="vertical-align:top;">
<table style="border:1px solid #B0B0B0; width:100%; vertical-align:top; text-align:left;">
<colgroup>
<col width="32%">
<col width="14%">
<col width="14%">
<col width="14%">
<col width="14%">
<col width="8%">
</colgroup>
<tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
<td class="tbhead">{t}Name{/t}</td><td class="tbhead">{t}Phone{/t}</td><td class="tbhead">{t}Fax{/t}</td>
<td class="tbhead">{t}Mobile{/t}</td><td class="tbhead">{t}Private{/t}</td><td class="tbrhead">{t}Contact{/t}</td>
</tr>
{$search_result}
</table>
<table style="vertical-align:top; text-align:center; width:100%;" border="0">
<tr>
<td>{$range_selector}</td>
</tr>
</table>
{if $show_info eq 1}
{include file=$address_info}
{/if}
</td>
<td style="vertical-align:top; width:270px;">
<div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
<p class="contentboxh"><img src="{$infoimage}" alt="[i]"/>{t}Information{/t}</p>
</div>
<div class="contentboxb">
<p class="contentboxb">
{t}The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in
'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search.{/t}
</p>
</div>
<br>
<div class="contentboxh">
<p class="contentboxh" style="vertical-align:middle;"><img src="{$actionimage}" style="vertical-align:middle;" alt="[a]"/>{t}Actions{/t}</p>
</div>
<div class="contentboxb">
<p class="contentboxb" style="vertical-align:middle;">
{if $internal_createable}
<img class="center" alt="" src="{$add_image}">&nbsp;
<a href="main.php{$plug}&amp;global=add" style="text-align:center;vertical-align:middle;">{t}Add entry{/t}</a><br>
{/if}
{if $internal eq 0}
{if $internal_editable}
<img alt="" src="{$edit_image}" class="center">&nbsp;
<a href="main.php{$plug}&amp;global=edit">{t}Edit entry{/t}</a><br>
{/if}
{if $internal_removeable}
<img alt="" src="{$delete_image}" class="center">&nbsp;
<a href="main.php{$plug}&amp;global=remove" style="vertical-align:middle;">{t}Remove entry{/t}</a><br>
{/if}
{/if}
</p>
</div>
<br>
<div class="contentboxh">
<p class="contentboxh">{t}Filters{/t}</p>
</div>
<div class="contentboxb">
<table style="width:100%;border-top:1px solid #B0B0B0;">
{$alphabet}
</table>
<table style="width:100%;border-top:1px solid #B0B0B0;">
<tr>
<td>
<input type="checkbox" name="organizational" value="1" {$organizational} onClick="mainform.submit()" title="{t}Select to see regular users{/t}">{t}Show organizational entries{/t}<br>
<input type="checkbox" name="global" value="1" {$global} onClick="mainform.submit()" title="{t}Select to see users in addressbook{/t}">{t}Show addressbook entries{/t}<br>
</td>
</tr>
</table>
<table style="width:100%;border-top:1px solid #B0B0B0;">
<tr>
<td>
<label for="search_base"><img class="center" alt="" src="{$tree_image}" title='{t}Display results for department{/t}'></label>
</td>
<td>
<select name="search_base" style='width:220px' onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
{html_options options=$deplist selected=$depselect}