Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-06 00:04:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always show address book name if multiple books are configured; fix styling

Browse Source
This commit is contained in:
thomascube
2011-07-26 17:21:26 +00:00
parent 210438a6be
commit da89cf2937
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
program/steps/addressbook/edit.inc
View File

@@ -54,7 +54,7 @@ else {
}
$SOURCE_ID = $source;
rcmail_set_sourcename($CONTACTS);
function rcmail_get_edit_record()
{

14
program/steps/addressbook/func.inc
View File

@@ -160,6 +160,20 @@ function rcmail_default_source($writable=false)
return $list[key($list)]['id'];
}
function rcmail_set_sourcename($abook)
{
global $OUTPUT;
// get address book name (for display)
if ($abook && $_SESSION['addressbooks_count'] > 1) {
$name = $abook->get_name();
if (!$name && $source == 0) {
$name = rcube_label('personaladrbook');
}
$OUTPUT->set_env('sourcename', $name);
}
}
function rcmail_directory_list($attrib)
{

8
program/steps/addressbook/show.inc
View File

@@ -34,13 +34,7 @@ if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
}
// get address book name (for display)
if ($_SESSION['addressbooks_count'] > 1) {
$name = $CONTACTS->get_name();
if (!$name && $source == 0) {
$name = rcube_label('personaladrbook');
}
$OUTPUT->set_env('sourcename', $name);
}
rcmail_set_sourcename($CONTACTS);
// return raw photo of the given contact
if ($RCMAIL->action == 'photo') {

2
skins/default/addressbook.css
View File

@@ -390,5 +390,5 @@ fieldset.contactfieldgroup legend
{
color: #666;
font-size: 10px;
margin-left: 2px;
margin: -5px 0 8px 2px;
}

6
skins/default/templates/contactadd.html
View File

@@ -10,9 +10,9 @@
<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
<div id="contact-details" class="boxcontent">
<form name="editform" method="post" action="./">
<div id="sourcename" style="height: 20px">
<roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" />
</div>
<roundcube:if condition="strlen(env:sourcename)" />
<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" /></div>
<roundcube:endif />
<div id="contactphoto">
<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
<div class="formlinks">

3
skins/default/templates/contactedit.html
View File

@@ -10,6 +10,9 @@
<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
<div id="contact-details" class="boxcontent">
<form name="editform" method="post" action="./">
<roundcube:if condition="strlen(env:sourcename)" />
<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
<roundcube:endif />
<div id="contactphoto">
<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
<div class="formlinks">