diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index c9dcd66ed..1626522f7 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -359,6 +359,7 @@ class AttributeLinkedSet extends AttributeDefinition { return "ERROR: LIST OF OBJECTS"; } + public function DuplicatesAllowed() {return false;} // No duplicates for 1:n links, never } /** @@ -375,6 +376,7 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet public function IsIndirect() {return true;} public function GetExtKeyToRemote() { return $this->Get('ext_key_to_remote'); } public function GetEditClass() {return "LinkedSet";} + public function DuplicatesAllowed() {$bRet = $this->GetOptional("duplicates", false); echo "

Dups: $bRet

"; return $bRet;} // The same object may be linked several times... or not... } /** @@ -1086,6 +1088,11 @@ class AttributeEmailAddress extends AttributeString { return "^([0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\\w]*[0-9a-zA-Z]\\.)+[a-zA-Z]{2,9})$"; } + + public function GetAsHTML($sValue) + { + return ''.parent::GetAsHTML($sValue).''; + } } /** diff --git a/core/dbobject.class.php b/core/dbobject.class.php index 19327ebfc..22504c0d4 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -400,7 +400,8 @@ abstract class DBObject $aAvailableFields = array(); foreach ($aExtKeyFriends as $sDispAttCode => $oExtField) { - $aAvailableFields[$oExtField->GetExtAttCode()] = $oExtField->GetAsHTML($this->Get($oExtField->GetCode())); +// $aAvailableFields[$oExtField->GetExtAttCode()] = $oExtField->GetAsHTML($this->Get($oExtField->GetCode())); + $aAvailableFields[$oExtField->GetExtAttCode()] = $this->Get($oExtField->GetCode()); } $sTargetClass = $oAtt->GetTargetClass(EXTKEY_ABSOLUTE); diff --git a/css/light-grey.css b/css/light-grey.css index 7b7d6e44b..089a4b059 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -172,6 +172,19 @@ td a.no-arrow:hover { padding-left:0px; background: inherit; } +td a.mailto, td a.mailto:visited { + text-decoration:none; + color:#000000; + padding-left:20px; + background: url(../images/mail.png) no-repeat left; +} +td a.mailto:hover { + text-decoration:underline; + color:#EB8F00; + padding-left:20px; + background: url(../images/mail.png) no-repeat left; +} + a.small_action { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 8pt; diff --git a/images/mail.png b/images/mail.png new file mode 100644 index 000000000..209400799 Binary files /dev/null and b/images/mail.png differ