Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Commit

Permalink
Merge branch '2018.11' into 2018.11-develop
Browse files Browse the repository at this point in the history 
Change-Id: I3b8485c92a031395840b7c2ced1e6c81f8dc1781
  • Loading branch information
@pschuele
pschuele committed Jun 14, 2018
2 parents 3372291 + b8d91cd commit 8aa553f
Show file tree
Hide file tree
Showing 41 changed files with 291 additions and 255 deletions.
4 changes: 2 additions & 2 deletions tine20/Addressbook/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ class Addressbook_Config extends Tinebase_Config_Abstract
'default' => array(
'records' => array(
array('id' => 'MR', 'value' => 'Mr', 'gender' => Addressbook_Model_Salutation::GENDER_MALE, 'image' => 'images/icon-set/icon_man.svg', 'system' => true), //_('Mr')
array('id' => 'MS', 'value' => 'Ms', 'gender' => Addressbook_Model_Salutation::GENDER_FEMALE, 'image' => 'images/empty_photo_female.png', 'system' => true), //_('Ms')
array('id' => 'COMPANY', 'value' => 'Company', 'gender' => Addressbook_Model_Salutation::GENDER_OTHER, 'image' => 'images/empty_photo_company.png', 'system' => true), //_('Company')
array('id' => 'MS', 'value' => 'Ms', 'gender' => Addressbook_Model_Salutation::GENDER_FEMALE, 'image' => 'images/icon-set/icon_woman.svg', 'system' => true), //_('Ms')
array('id' => 'COMPANY', 'value' => 'Company', 'gender' => Addressbook_Model_Salutation::GENDER_OTHER, 'image' => 'images/icon-set/icon_company.svg','system' => true), //_('Company')
),
// 'default' => 'MR'
)
Expand Down
2 changes: 1 addition & 1 deletion tine20/Addressbook/Export/Pdf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function generate(Addressbook_Model_Contact $_contact)
}
$title = implode(' ', $titleArray);
$subtitle = $_contact->org_name;
$titleIcon = "/images/oxygen/32x32/apps/system-users.png";
$titleIcon = null; // no svg support yet

// add data to array
$record = array ();
Expand Down
2 changes: 1 addition & 1 deletion tine20/Addressbook/Frontend/Json.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ protected function _multipleRecordsToJson(Tinebase_Record_RecordSet $_records, $
*/
protected function _getImageLink($contactArray)
{
$link = 'images/empty_photo_blank.png';
$link = 'images/icon-set/icon_undefined_contact.svg';
if (! empty($contactArray['jpegphoto'])) {
$link = Tinebase_Model_Image::getImageUrl('Addressbook', $contactArray['id'], '');
} else if (isset($contactArray['salutation']) && ! empty($contactArray['salutation'])) {
Expand Down
16 changes: 15 additions & 1 deletion tine20/Addressbook/Setup/Update/Release11.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,25 @@ public function update_9()
}

/**
* update to 12.0
* update to 11.11
*
* @return void
* @throws \Tinebase_Exception_InvalidArgument
* @throws Tinebase_Exception_NotFound
*/
public function update_10()
{
$this->updateKeyFieldIcon(Addressbook_Config::getInstance(), Addressbook_Config::CONTACT_SALUTATION);

$this->setApplicationVersion('Addressbook', '11.11');
}

/**
* update to 12.0
*
* @return void
*/
public function update_11()
{
$this->setApplicationVersion('Addressbook', '12.0');
}
Expand Down
24 changes: 24 additions & 0 deletions tine20/Addressbook/Setup/Update/Release12.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

/**
* Tine 2.0
*
* @package Addressbook
* @subpackage Setup
* @license http://www.gnu.org/licenses/agpl.html AGPL3
* @copyright Copyright (c) 2014-2018 Metaways Infosystems GmbH (http://www.metaways.de)
* @author Philipp Schüle <p.schuele@metaways.de>
*/
class Addressbook_Setup_Update_Release12 extends Setup_Update_Abstract
{
/**
* @return void
*/
public function update_0()
{
$release11 = new Addressbook_Setup_Update_Release11($this->_backend);
$release11->update_10();

$this->setApplicationVersion('Addressbook', '12.1');
}
}
2 changes: 1 addition & 1 deletion tine20/Addressbook/Setup/setup.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<application>
<name>Addressbook</name>
<version>12.0</version>
<version>12.1</version>
<order>10</order>
<depends>
<application>Admin</application>
Expand Down
2 changes: 1 addition & 1 deletion tine20/Addressbook/js/ContactEditDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Tine.Addressbook.ContactEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog,
'select': function (combo, record, index) {
var jpegphoto = this.getForm().findField('jpegphoto');
// set new empty photo depending on chosen salutation only if user doesn't have own image
jpegphoto.setDefaultImage(record.json.image || 'images/empty_photo_blank.png');
jpegphoto.setDefaultImage(record.json.image || 'images/icon-set/icon_undefined_contact.svg');
}
}
}), {
Expand Down
2 changes: 1 addition & 1 deletion tine20/Admin/css/Admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

.admin-node-customfields {
background-image:url(../../images/icon-set/icon_settings.svg) !important;
background-image:url(../../images/icon-set/icon_customfield.svg) !important;
}

.admin-action-add-customfield {
Expand Down
14 changes: 7 additions & 7 deletions tine20/Calendar/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,9 @@ class Calendar_Config extends Tinebase_Config_Abstract
'setByAdminModule' => false,
'default' => [
'records' => [
['id' => 'CONFIRMED', 'value' => 'Confirmed', 'icon' => 'images/oxygen/16x16/actions/ok.png', 'system' => true], //_('Confirmed')
['id' => 'CANCELED', 'value' => 'Canceled', 'icon' => 'images/oxygen/16x16/actions/dialog-cancel.png', 'system' => true], //_('Canceled')
['id' => 'TENTATIVE', 'value' => 'Tentative', 'icon' => 'images/calendar-response-tentative.png', 'system' => true], //_('Tentative')
['id' => 'CONFIRMED', 'value' => 'Confirmed', 'icon' => 'images/icon-set/icon_ok.svg', 'system' => true], //_('Confirmed')
['id' => 'CANCELED', 'value' => 'Canceled', 'icon' => 'images/icon-set/icon_calendar_attendee_cancle.svg', 'system' => true], //_('Canceled')
['id' => 'TENTATIVE', 'value' => 'Tentative', 'icon' => 'images/icon-set/icon_calendar_attendee_tentative.svg', 'system' => true], //_('Tentative')
],
'default' => 'CONFIRMED'
]
Expand Down Expand Up @@ -354,10 +354,10 @@ class Calendar_Config extends Tinebase_Config_Abstract
'setByAdminModule' => TRUE,
'default' => array(
'records' => array(
array('id' => 'NEEDS-ACTION', 'value' => 'No response', 'icon' => 'images/oxygen/16x16/actions/mail-mark-unread-new.png', 'system' => true), //_('No response')
array('id' => 'ACCEPTED', 'value' => 'Accepted', 'icon' => 'images/oxygen/16x16/actions/ok.png', 'system' => true), //_('Accepted')
array('id' => 'DECLINED', 'value' => 'Declined', 'icon' => 'images/oxygen/16x16/actions/dialog-cancel.png', 'system' => true), //_('Declined')
array('id' => 'TENTATIVE', 'value' => 'Tentative', 'icon' => 'images/calendar-response-tentative.png', 'system' => true), //_('Tentative')
array('id' => 'NEEDS-ACTION', 'value' => 'No response', 'icon' => 'images/icon-set/icon_invite.svg', 'system' => true), //_('No response')
array('id' => 'ACCEPTED', 'value' => 'Accepted', 'icon' => 'images/icon-set/icon_ok.svg', 'system' => true), //_('Accepted')
array('id' => 'DECLINED', 'value' => 'Declined', 'icon' => 'images/icon-set/icon_calendar_attendee_cancle.svg', 'system' => true), //_('Declined')
array('id' => 'TENTATIVE', 'value' => 'Tentative', 'icon' => 'images/icon-set/icon_calendar_attendee_tentative.svg', 'system' => true), //_('Tentative')
),
'default' => 'NEEDS-ACTION'
)
Expand Down
19 changes: 15 additions & 4 deletions tine20/Calendar/Setup/Update/Release11.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ public function update_6()
public function update_7()
{
$containers = Tinebase_Container::getInstance()->search(new Tinebase_Model_ContainerFilter([
['field' => 'application_id', 'operator' => 'equqls', 'value' => Tinebase_Application::getInstance()
['field' => 'application_id', 'operator' => 'equals', 'value' => Tinebase_Application::getInstance()
->getApplicationByName('Calendar')->getId()],
['field' => 'model', 'operator' => 'equqls', 'value' => Calendar_Model_Event::class],
['field' => 'type', 'operator' => 'equqls', 'value' => Tinebase_Model_Container::TYPE_PERSONAL],
['field' => 'model', 'operator' => 'equals', 'value' => Calendar_Model_Event::class],
['field' => 'type', 'operator' => 'equals', 'value' => Tinebase_Model_Container::TYPE_PERSONAL],
]));

/** @var Tinebase_Model_Container $container */
Expand All @@ -210,12 +210,23 @@ public function update_7()
$this->setApplicationVersion('Calendar', '11.8');
}

/**
* update to 11.9
*/
public function update_8()
{
$this->updateKeyFieldIcon(Calendar_Config::getInstance(), Calendar_Config::ATTENDEE_STATUS);
$this->updateKeyFieldIcon(Calendar_Config::getInstance(), Calendar_Config::EVENT_STATUS);

$this->setApplicationVersion('Calendar', '11.9');
}

/**
* update to 12.0
*
* @return void
*/
public function update_8()
public function update_9()
{
$this->setApplicationVersion('Calendar', '12.0');
}
Expand Down
12 changes: 11 additions & 1 deletion tine20/Calendar/Setup/Update/Release12.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,19 @@ class Calendar_Setup_Update_Release12 extends Setup_Update_Abstract
*/
public function update_0()
{
$release11 = new Calendar_Setup_Update_Release8($this->_backend);
$release11 = new Calendar_Setup_Update_Release11($this->_backend);
$release11->update_6();
$release11->update_7();
$this->setApplicationVersion('Calendar', '12.1');
}

/**
* update to 12.2
*/
public function update_1()
{
$release11 = new Calendar_Setup_Update_Release11($this->_backend);
$release11->update_8();
$this->setApplicationVersion('Calendar', '12.2');
}
}
6 changes: 3 additions & 3 deletions tine20/Calendar/Setup/Update/Release5.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public function update_1()
$attendeeStatusConfig = array(
'name' => Calendar_Config::ATTENDEE_STATUS,
'records' => array(
array('id' => 'NEEDS-ACTION', 'value' => 'No response', 'icon' => 'images/oxygen/16x16/actions/mail-mark-unread-new.png', 'system' => true), //_('No response')
array('id' => 'ACCEPTED', 'value' => 'Accepted', 'icon' => 'images/oxygen/16x16/actions/ok.png', 'system' => true), //_('Accepted')
array('id' => 'DECLINED', 'value' => 'Declined', 'icon' => 'images/oxygen/16x16/actions/dialog-cancel.png', 'system' => true), //_('Declined')
array('id' => 'NEEDS-ACTION', 'value' => 'No response', 'icon' => 'images/icon-set/icon_invite.svg', 'system' => true), //_('No response')
array('id' => 'ACCEPTED', 'value' => 'Accepted', 'icon' => 'images/icon-set/icon_ok.svg', 'system' => true), //_('Accepted')
array('id' => 'DECLINED', 'value' => 'Declined', 'icon' => 'images/icon-set/icon_stop.svg', 'system' => true), //_('Declined')
array('id' => 'TENTATIVE', 'value' => 'Tentative', 'icon' => 'images/calendar-response-tentative.png', 'system' => true), //_('Tentative')
),
);
Expand Down
2 changes: 1 addition & 1 deletion tine20/Calendar/Setup/setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<application>
<name>Calendar</name>
<!-- gettext('Calendar') -->
<version>12.1</version>
<version>12.2</version>
<order>15</order>
<status>enabled</status>
<tables>
Expand Down
2 changes: 1 addition & 1 deletion tine20/Calendar/js/MainScreenCenterPanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Tine.Calendar.MainScreenCenterPanel = Ext.extend(Ext.Panel, {
requiredGrant: 'deleteGrant',
text: this.app.i18n._('Copy Event to clipboard'),
handler: this.onCopyToEvent.createDelegate(this),
iconCls: 'action_editcopy'
iconCls: 'action_copy'
});

this.action_cancelPasting = new Ext.Action({
Expand Down
6 changes: 3 additions & 3 deletions tine20/Courses/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ class Courses_Config extends Tinebase_Config_Abstract
'clientRegistryInclude' => TRUE,
'default' => array(
'records' => array(
array('id' => 'ON', 'value' => 'On', 'image' => 'images/oxygen/16x16/actions/dialog-apply.png', 'system' => true), //_('On')
array('id' => 'OFF', 'value' => 'Off', 'image' => 'images/oxygen/16x16/actions/dialog-cancel.png', 'system' => true), //_('Off')
array('id' => 'FILTERED', 'value' => 'Filtered', 'image' => 'images/oxygen/16x16/actions/view-choose.png', 'system' => true), //_('Filtered')
array('id' => 'ON', 'value' => 'On', 'image' => 'images/icon-set/icon_ok.svg', 'system' => true), //_('On')
array('id' => 'OFF', 'value' => 'Off', 'image' => 'images/icon-set/icon_stop.svg', 'system' => true), //_('Off')
array('id' => 'FILTERED', 'value' => 'Filtered', 'image' => 'images/icon-set/icon_IP.svg', 'system' => true), //_('Filtered')
),
)
),
Expand Down
12 changes: 11 additions & 1 deletion tine20/Courses/Setup/Update/Release11.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,22 @@
*/
class Courses_Setup_Update_Release11 extends Setup_Update_Abstract
{
/**
* update to 11.1
*/
public function update_0()
{
$this->updateKeyFieldIcon(Courses_Config::getInstance(), Courses_Config::INTERNET_ACCESS);

$this->setApplicationVersion('Courses', '11.1');
}

/**
* update to 12.0
*
* @return void
*/
public function update_0()
public function update_1()
{
$this->setApplicationVersion('Courses', '12.0');
}
Expand Down
22 changes: 22 additions & 0 deletions tine20/Courses/Setup/Update/Release12.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php
/**
* Tine 2.0
*
* @package Courses
* @subpackage Setup
* @license http://www.gnu.org/licenses/agpl.html AGPL3
* @copyright Copyright (c) 2012-2018 Metaways Infosystems GmbH (http://www.metaways.de)
* @author Stefanie Stamer <s.stamer@metaways.de>
*/
class Courses_Setup_Update_Release12 extends Setup_Update_Abstract
{
/**
* update to 12.1
*/
public function update_0()
{
$release11 = new Courses_Setup_Update_Release11($this->_backend);
$release11->update_0();
$this->setApplicationVersion('Courses', '12.1');
}
}
2 changes: 1 addition & 1 deletion tine20/Courses/Setup/setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<application>
<name>Courses</name>
<!-- gettext('Courses') -->
<version>12.0</version>
<version>12.1</version>
<order>50</order>
<status>enabled</status>
<depends>
Expand Down
4 changes: 2 additions & 2 deletions tine20/Crm/Export/Pdf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ protected function getLinkedObjects(Crm_Model_Lead $_lead, Zend_Locale $_locale,

$linkedObjects[] = array($_translate->_('Contacts'), 'headline');

$types = array ( "customer" => "/images/oxygen/32x32/apps/system-users.png",
"partner" => "/images/oxygen/32x32/actions/view-process-own.png",
$types = array ( "customer" => "/images/oxygen/32x32/apps/system-users.png",
"partner" => "/images/oxygen/32x32/actions/view-process-own.png",
"responsible" => "/images/oxygen/32x32/apps/preferences-desktop-user.png",
);

Expand Down
49 changes: 3 additions & 46 deletions tine20/Crm/css/Crm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,6 @@
background-image:url(../../images/icon-set/icon_crm.svg) !important;
}

.actionAddTask {
background-image:url(../../images/oxygen/16x16/actions/todo.png) !important;
}
.x-btn-medium .actionAddTask {
background-image:url(../../images/oxygen/22x22/actions/todo.png) !important;
}
.x-btn-large .actionAddTask {
background-image:url(../../images/oxygen/32x32/actions/todo.png) !important;
}


.actionDelete {
background-image:url(../../images/oxygen/16x16/actions/edit-delete.png) !important;
}
.x-btn-medium .actionDelete {
background-image:url(../../images/oxygen/22x22/actions/edit-delete.png) !important;
}
.x-btn-large .actionDelete {
background-image:url(../../images/oxygen/32x32/actions/edit-delete.png) !important;
}


.activities-item-small {
padding: 2px 4px;
border-bottom: 1px solid #B5B8C8;
Expand Down Expand Up @@ -78,37 +56,16 @@


.contactIconResponsible {
background-image:url(../../images/oxygen/16x16/apps/preferences-desktop-user.png) !important;
background-image:url(../../images/icon-set/icon_responsible.svg) !important;
}
.x-btn-medium .contactIconResponsible {
background-image:url(../../images/oxygen/22x22/apps/preferences-desktop-user.png) !important;
}
.x-btn-large .contactIconResponsible {
background-image:url(../../images/oxygen/32x32/apps/preferences-desktop-user.png) !important;
}


.contactIconCustomer {
background-image:url(../../images/oxygen/16x16/apps/system-users.png) !important;
}
.x-btn-medium .contactIconCustomer {
background-image:url(../../images/oxygen/22x22/apps/system-users.png) !important;
}
.x-btn-large .contactIconCustomer {
background-image:url(../../images/oxygen/32x32/apps/system-users.png) !important;
background-image:url(../../images/icon-set/icon_client.svg) !important;
}


.contactIconPartner {
background-image:url(../../images/oxygen/16x16/actions/view-process-own.png) !important;
}
.x-btn-medium .contactIconPartner {
background-image:url(../../images/oxygen/22x22/actions/view-process-own.png) !important;
background-image:url(../../images/icon-set/icon_partner.svg) !important;
}
.x-btn-large .contactIconPartner {
background-image:url(../../images/oxygen/32x32/actions/view-process-own.png) !important;
}


.productSummary {
background: transparent none repeat;
Expand Down
6 changes: 3 additions & 3 deletions tine20/ExampleApplication/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ class ExampleApplication_Config extends Tinebase_Config_Abstract
self::SETBYSETUPMODULE => false,
self::DEFAULT_STR => array(
'records' => array(
array('id' => 'COMPLETED', 'value' => 'Completed', 'is_open' => 0, 'icon' => 'images/oxygen/16x16/actions/ok.png', 'system' => true), //_('Completed')
array('id' => 'CANCELLED', 'value' => 'Cancelled', 'is_open' => 0, 'icon' => 'images/oxygen/16x16/actions/dialog-cancel.png', 'system' => true), //_('Cancelled')
array('id' => 'IN-PROCESS', 'value' => 'In process', 'is_open' => 1, 'icon' => 'images/oxygen/16x16/actions/view-refresh.png', 'system' => true), //_('In process')
array('id' => 'COMPLETED', 'value' => 'Completed', 'is_open' => 0, 'icon' => 'images/icon-set/icon_ok.svg', 'system' => true), //_('Completed')
array('id' => 'CANCELLED', 'value' => 'Cancelled', 'is_open' => 0, 'icon' => 'images/icon-set/icon_stop.svg', 'system' => true), //_('Cancelled')
array('id' => 'IN-PROCESS', 'value' => 'In process', 'is_open' => 1, 'icon' => 'images/icon-set/icon_reload.svg', 'system' => true), //_('In process')
),
self::DEFAULT_STR => 'IN-PROCESS'
)
Expand Down
Loading

0 comments on commit 8aa553f

Please sign in to comment.